From d2952de6e3d9197529695bb88d8c3af679ad71af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Wed, 24 Aug 2005 19:41:43 +0000 Subject: [PATCH] =?UTF-8?q?Wed=20Aug=2024=2015:39:07=202005=20S=C3=B8ren?= =?UTF-8?q?=20Sandmann=20=20Add=20GLX=5F{INC,LIBS}=20?= =?UTF-8?q?for=20xprint.=20Add=20@DIX=5FFLAGS@=20to=20AM=5FCFLAGS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 6 ++++++ configure.ac | 6 +++--- hw/xfree86/dixmods/Makefile.am | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 573658985..3e3216940 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 24 15:39:07 2005 Søren Sandmann + + * configure.ac: Add GLX_{INC,LIBS} for xprint. + + * hw/xfree86/dixmods/Makefile.am: Add @DIX_FLAGS@ to AM_CFLAGS + 2005-08-24 Alan Coopersmith * configure.ac: diff --git a/configure.ac b/configure.ac index ae0a95ea2..5e5bf7d30 100644 --- a/configure.ac +++ b/configure.ac @@ -760,9 +760,9 @@ AM_CONDITIONAL(XPRINT, [test x$XPRINT = xyes]) if test "x$XPRINT" = xyes; then PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont]) - XPRINT_EXTENSIONS="$XEXT_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB" - XPRINT_INCLUDES="$XEXT_INC $RENDER_INC $COMPOSITE_INC $RANDR_INC $XI_INC $FIXES_INC $DAMAGE_INC $XI_INC" - XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB" + XPRINT_EXTENSIONS="$XEXT_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]) fi diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 7d745fde1..b648d69b3 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -22,7 +22,7 @@ module_LTLIBRARIES = libafb.la \ libtype1.la \ $(GLXMODS) -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/afb \ -I$(top_srcdir)/cfb \