diff options
| author | Keith Packard <keithp@keithp.com> | 2005-08-08 00:38:41 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2005-08-08 00:38:41 +0000 |
| commit | 4dfc3357a78a52ef70750608138dfeef0371cbc4 (patch) | |
| tree | b810fd3b3033346c3d844fa711dc494a4e689526 /configure.ac | |
| parent | 7d2b08aa4786eb4d181c88f7dc6b7eb059cc9dad (diff) | |
Add autogenerated source files and other various non-CVS material to
.cvsignore files
Use XORG_CFLAGS. Ensure that all exa files are in SOURCES
remove _XOPEN_SOURCE as it's always in xtrans.pc these days and gcc whines
libdamage.la needs libcw.la when COMPOSITE is defined, but that
libdamage.la must be after libcomposite.la, so add libcw.la to
DAMAGE_LIB instead of EXTENSION_LIBS. Regularize library link order
across all X servers
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 57128080a..c09aee467 100644 --- a/configure.ac +++ b/configure.ac @@ -585,7 +585,7 @@ EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.la' EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext' if test "$COMPOSITE" = yes; then - EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'" "'$(top_builddir)/miext/cw/libcw.la' + EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la' EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite' fi @@ -598,6 +598,10 @@ MI_INC='-I$(top_srcdir)/mi' FB_LIB='$(top_builddir)/fb/libfb.la' FB_INC='-I$(top_srcdir)/fb' DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la' +# damage (may) need the composite wrapper when composite is enabled +if test "$COMPOSITE" = yes; then + DAMAGE_LIB="$DAMAGE_LIB "'$(top_builddir)/miext/cw/libcw.la' +fi DAMAGE_INC='-I$(top_srcdir)/miext/damage' SHADOW_INC='-I$(top_srcdir)/miext/shadow' SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la' @@ -612,11 +616,11 @@ PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES]) XSERVER_LIBS="${XSERVER_LIBS} -lm -lz" XORG_CORE_LIBS="$DIX_LIB" -XORG_LIBS="$MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $EXTENSION_LIBS $XPSTUBS_LIB $OS_LIB" +XORG_LIBS="$MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $XPSTUBS_LIB $OS_LIB" XVFB_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB" XNEST_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB" -XWIN_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $EXTENSION_LIBS $XPSTUBS_LIB $OS_LIB $SHADOW_LIB" -XDMX_LIBS="$FB_LIB $MI_LIB $DMX_EXTENSIONS $XI_LIB $XKB_LIB $DAMAGE_LIB $OS_LIB $SHADOW_LIB" +XWIN_LIBS="$FB_LIB $MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB" +XDMX_LIBS="$FB_LIB $MI_LIB $DMX_EXTENSIONS $EXTENSION_LIBS $XI_LIB $XKB_LIB $DAMAGE_LIB $OS_LIB $SHADOW_LIB" XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" |