summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-10-14 06:10:06 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-10-14 06:10:06 +0000
commit7e3e9ed97ba25bb84286f97fe6882a37c9aa7e25 (patch)
treedb36f887beb1b96fb534dcbbf2a3c11e394eb0c7
parent821584fcd3bf83f3aaacd35e54323f71d976db44 (diff)
Add XTRAP_LIB to XPRINT_EXTENSIONS to fix xprint build when xtrap is
enabled.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 779b07d84..663bd6494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-10-13 Donnie Berkholz <spyderous@gentoo.org>
+ * configure.ac: Add XTRAP_LIB to XPRINT_EXTENSIONS to fix xprint build when
+ xtrap is enabled.
+
+2005-10-13 Donnie Berkholz <spyderous@gentoo.org>
+
* configure.ac: Require glproto >= 1.4.1 if building DRI with GLX. This
fixes a build failure on a number of hyperpipe functions.
diff --git a/configure.ac b/configure.ac
index 3be985c88..2102f69d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -946,7 +946,7 @@ AM_CONDITIONAL(XPRINT, [test x$XPRINT = xyes])
if test "x$XPRINT" = xyes; then
PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
- XPRINT_EXTENSIONS="$XEXT_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
+ XPRINT_EXTENSIONS="$XEXT_LIB $XTRAP_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
XPRINT_INCLUDES="$XEXT_INC $RENDER_INC $COMPOSITE_INC $RANDR_INC $XI_INC $FIXES_INC $DAMAGE_INC $XI_INC $GLX_INC"
XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $GLX_INC"
AC_SUBST([XPRINT_LIBS])