Wed Aug 24 15:39:07 2005 Søren Sandmann <sandmann@redhat.com>
Add GLX_{INC,LIBS} for xprint. Add @DIX_FLAGS@ to AM_CFLAGS
This commit is contained in:
parent
81e708440c
commit
d2952de6e3
|
@ -1,3 +1,9 @@
|
|||
Wed Aug 24 15:39:07 2005 Søren Sandmann <sandmann@redhat.com>
|
||||
|
||||
* configure.ac: Add GLX_{INC,LIBS} for xprint.
|
||||
|
||||
* hw/xfree86/dixmods/Makefile.am: Add @DIX_FLAGS@ to AM_CFLAGS
|
||||
|
||||
2005-08-24 Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
* 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
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue
Block a user