xserver configure.ac,3.106,3.107
Dave Airlie
xserver-commit at pdx.freedesktop.org
Thu Dec 22 22:31:35 PST 2005
Committed by: airlied
Update of /cvs/xserver/xserver
In directory gabe:/tmp/cvs-serv18285
Modified Files:
configure.ac
Log Message:
fix up configure.ac to not affect other servers so much after Xgl changes
Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.106
retrieving revision 3.107
diff -u -d -r3.106 -r3.107
--- configure.ac 23 Dec 2005 02:07:57 -0000 3.106
+++ configure.ac 23 Dec 2005 06:31:33 -0000 3.107
@@ -79,7 +79,8 @@
# tslib touchscreen driver
AC_CHECK_HEADERS([tslib.h])
-REQUIRED_MODULES="xrandr xrender xfixes xdamage xext xfont xproto xtrans xau"
+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau"
+XGL_REQUIRED_MODULES="xrandr xrender xfixes xdamage xext"
DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
DEFAULT_MODULE_PATH="$libdir/modules"
@@ -113,7 +114,7 @@
AC_ARG_ENABLE(dri, [ --enable-dri ],[DRI=$enableval],[DRI=no])
AC_ARG_ENABLE(xinput, [ --enable-xinput ],[XINPUT=$enableval],[XINPUT=no])
AC_ARG_ENABLE(xkb, [ --enable-xkb ],[XKB=$enableval],[XKB=no])
-AC_ARG_ENABLE(xloadable, [ --disable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=yes])
+AC_ARG_ENABLE(xloadable, [ --enable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=no])
AC_ARG_ENABLE(xinerama, [ --enable-xinerama ],[XINERAMA=$enableval],[XINERAMA=no])
AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
@@ -157,7 +158,8 @@
AM_CONDITIONAL(COMPOSITE, [test x$COMPOSITE = xyes])
if test "$COMPOSITE" = yes; then
AC_DEFINE(COMPOSITE,1,[Support Composite Extension])
- REQUIRED_MODULES="$REQUIRED_MODULES xcomposite"
+ REQUIRED_MODULES="$REQUIRED_MODULES compositeproto"
+ XGL_REQURIED_MODULES="$XGL_REQUIRED_MODULES xcomposite"
fi
AM_CONDITIONAL(MITSHM, [test x$MITSHM = xyes])
@@ -188,12 +190,13 @@
XWIN_REQUIRED_MODULES="x11"
fi
-XGL_REQUIRED_GLITZ_VERSION="0.4.4"
+XGL_REQUIRED_GLITZ_VERSION="0.5.0"
AM_CONDITIONAL(XGLSERVER, [test x$XGLSERVER = xyes])
if test "$XGLSERVER" = yes; then
+ XLOADABLE=yes
AC_DEFINE(XGLSERVER,1,[Build GL X server])
fi
-XGL_REQUIRED_MODULES="$REQUIRED_MODULES glitz >= $XGL_REQUIRED_GLITZ_VERSION"
+XGL_REQUIRED_MODULES="$XGL_REQUIRED_MODULES glitz >= $XGL_REQUIRED_GLITZ_VERSION"
AM_CONDITIONAL(XGLXSERVER, [test x$XGLXSERVER = xyes])
if test "$XGLXSERVER" = yes; then
@@ -219,13 +222,14 @@
AM_CONDITIONAL(RES, [test x$RES = xyes])
if test "$RES" = yes; then
AC_DEFINE(RES,1,[Support X resource extension])
- REQUIRED_MODULES="$REQUIRED_MODULES xres"
+ REQUIRED_MODULES="$REQUIRED_MODULES resourceproto"
+ XGL_REQUIRED_MODULES="$XGL_REQUIRED_MODULES xres"
fi
AM_CONDITIONAL(RECORD, [test x$RECORD = xyes])
if test "$RECORD" = yes; then
AC_DEFINE(XRECORD,1,[Support X record extension])
- REQUIRED_MODULES="$REQUIRED_MODULES xrecord"
+ REQUIRED_MODULES="$REQUIRED_MODULES recordproto"
EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/record'
EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/record/librecord.a'
fi
@@ -266,7 +270,8 @@
if test "$XINERAMA" = yes; then
AC_DEFINE(XINERAMA,1,[Support Xinerama extension])
AC_DEFINE(PANORAMIX,1,[Internal define for Xinerama])
- REQUIRED_MODULES="$REQUIRED_MODULES panoramixext"
+ REQUIRED_MODULES="$REQUIRED_MODULES panoramixproto"
+ XGL_REQUIRED_MODULES="$XGL_REQUIRED_MODULES panoramixext"
fi
AM_CONDITIONAL(XLOADABLE, [test x$XLOADABLE = xyes])
@@ -421,13 +426,15 @@
SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.a'
SHADOW_INC='-I$(top_srcdir)/miext/shadow'
XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.a'
-XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
XKB_LIB='$(top_builddir)/xkb/libxkb.a'
XI_LIB='$(top_builddir)/Xi/libXi.a'
XI_INC='-I$(top_builddir)/Xi'
PKG_CHECK_MODULES(XSERVER, $REQUIRED_MODULES)
+XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
+AC_SUBST([XSERVER_LIBS])
+
KDRIVE_LIBS=
KDRIVE_INCS=
KDRIVE_PURE_LIBS=
@@ -512,7 +519,7 @@
$FB_INC $MI_INC"
if test "$XLOADABLE" = yes; then
- XGLSERVER_LIBS="$XGLSERVER_LIBS -ldl"
+ XGLSERVER_LIBS="$XSERVER_LIBS $XGLSERVER_LIBS -ldl"
fi
if test "x$GLX" = xyes; then
More information about the xserver-commit
mailing list