xserver configure.ac,3.105,3.106

Thu Dec 22 18:07:59 PST 2005

Committed by: airlied

Update of /cvs/xserver/xserver
In directory gabe:/tmp/cvs-serv19869

Modified Files:
	configure.ac 
Log Message:
Well there were a couple of snapshots later than CVS available outside of 
Novell, so I've done a crazy merge to try and get them into a workable 
CVS, I suspect I may have failed.. there is a pre-xgldrop-merge tag if I did.


Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.105
retrieving revision 3.106
diff -u -d -r3.105 -r3.106

--- configure.ac	19 Sep 2005 04:02:31 -0000	3.105
+++ configure.ac	23 Dec 2005 02:07:57 -0000	3.106
@@ -79,10 +79,10 @@
 # tslib touchscreen driver
 AC_CHECK_HEADERS([tslib.h])
 
-# REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
-REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau"
+REQUIRED_MODULES="xrandr xrender xfixes xdamage xext xfont xproto xtrans xau"
 
 DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
+DEFAULT_MODULE_PATH="$libdir/modules"
 DEFAULT_VENDOR_STRING="freedesktop.org"
 DEFAULT_VENDOR_RELEASE="6710"
 EXTENSION_LIBS='$(top_builddir)/Xext/libXext.a'
@@ -100,8 +100,8 @@
 AC_ARG_ENABLE(xwinserver,    [  --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=no])
 AC_ARG_ENABLE(xsdlserver,    [  --enable-xsdlserver ],[XSDLSERVER=$enableval],[XSDLSERVER=no])
 AC_ARG_ENABLE(xglserver,     [  --enable-xglserver ],[XGLSERVER=$enableval],[XGLSERVER=no])
-AC_ARG_ENABLE(xglxserver,    [  --enable-xglxserver ],[XGLXSERVER=$enableval],[XGLXSERVER=yes])
-AC_ARG_ENABLE(xeglserver,    [  --enable-xeglserver ],[XEGLSERVER=$enableval],[XEGLSERVER=yes])
+AC_ARG_ENABLE(xglxserver,    [  --enable-xglxserver ],[XGLXSERVER=$enableval],[XGLXSERVER=no])
+AC_ARG_ENABLE(xeglserver,    [  --enable-xeglserver ],[XEGLSERVER=$enableval],[XEGLSERVER=no])
 AC_ARG_ENABLE(xtrap,         [  --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no])
 AC_ARG_ENABLE(builtinrgb,    [  --disable-builtinrgb ],[USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes])
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ],
@@ -113,7 +113,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,     [  --enable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=no])
+AC_ARG_ENABLE(xloadable,     [  --disable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=yes])
 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])
@@ -134,6 +134,9 @@
 AC_ARG_WITH(fontpath,        [  --with-fontpath=PATH ],
 				[FONTPATH="$withval"],
 				[FONTPATH="$DEFAULT_FONT_PATH"])
+AC_ARG_WITH(modulepath,         [  --with-modulepath=PATH ],
+				[MODULEPATH="$withval"],
+				[MODULEPATH="$DEFAULT_MODULE_PATH"])
 AC_ARG_WITH(vendor-string,   [  --with-vendor-string=VENDOR ],
 			     	[ VENDOR_STRING="$withval" ],
 			     	[ VENDOR_STRING="$DEFAULT_VENDOR_STRING" ])
@@ -154,7 +157,7 @@
 AM_CONDITIONAL(COMPOSITE, [test x$COMPOSITE = xyes])
 if test "$COMPOSITE" = yes; then
 	AC_DEFINE(COMPOSITE,1,[Support Composite Extension])
-	REQUIRED_MODULES="$REQUIRED_MODULES compositeproto"
+	REQUIRED_MODULES="$REQUIRED_MODULES xcomposite"
 fi
 
 AM_CONDITIONAL(MITSHM, [test x$MITSHM = xyes])
@@ -185,23 +188,24 @@
 	XWIN_REQUIRED_MODULES="x11"
 fi
 
+XGL_REQUIRED_GLITZ_VERSION="0.4.4"
 AM_CONDITIONAL(XGLSERVER, [test x$XGLSERVER = xyes])
 if test "$XGLSERVER" = yes; then
 	AC_DEFINE(XGLSERVER,1,[Build GL X server])
-	XGL_REQUIRED_MODULES="glitz >= 0.4.3"
 fi
+XGL_REQUIRED_MODULES="$REQUIRED_MODULES glitz >= $XGL_REQUIRED_GLITZ_VERSION"
 
 AM_CONDITIONAL(XGLXSERVER, [test x$XGLXSERVER = xyes])
 if test "$XGLXSERVER" = yes; then
 	AC_DEFINE(XGLXSERVER,1,[Build GLX X server])
-	XGLX_REQUIRED_MODULES="glitz-glx >= 0.4.3 xrender >= 0.5.0"
 fi
+XGLX_REQUIRED_MODULES="glitz-glx >= $XGL_REQUIRED_GLITZ_VERSION xrender >= 0.5.0"
 
 AM_CONDITIONAL(XEGLSERVER, [test x$XEGLSERVER = xyes])
 if test "$XEGLSERVER" = yes; then
-        AC_DEFINE(XEGLSERVER,1,[Build EGL X server])
-        XEGL_REQUIRED_MODULES="glitz-egl >= 0.4.3 xrender >= 0.5.0"
+	AC_DEFINE(XEGLSERVER,1,[Build EGL X server])
 fi
+XEGL_REQUIRED_MODULES="glitz-egl >= $XGL_REQUIRED_GLITZ_VERSION"
 
 AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
 if test "$XTRAP" = yes; then
@@ -215,13 +219,13 @@
 AM_CONDITIONAL(RES, [test x$RES = xyes])
 if test "$RES" = yes; then
 	AC_DEFINE(RES,1,[Support X resource extension])
-	REQUIRED_MODULES="$REQUIRED_MODULES resourceproto"
+	REQUIRED_MODULES="$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 recordproto"
+	REQUIRED_MODULES="$REQUIRED_MODULES xrecord"
 	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/record'
 	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/record/librecord.a'
 fi
@@ -229,9 +233,12 @@
 AM_CONDITIONAL(GLX, test x$GLX = xyes)
 if test "$GLX" = yes; then
 	AC_DEFINE(GLXEXT,1,[Build GLX extension])
-	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/GL/glx -I$(top_srcdir)/GL/include -I$(MESA_SOURCE)/include'
-	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/GL/glx/libglx.a $(top_builddir)/GL/mesa/libglcore.a'
+	GLXDDX_LIB='$(top_builddir)/GL/mesa/libxf86glxddx.a'
+	GLX_INCS='-I$(top_srcdir)/GL/glx -I$(top_srcdir)/GL/include -I$(MESA_SOURCE)/include'
+	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libglcore.la'
 fi
+AC_SUBST([GLX_INCS])
+AC_SUBST([GLX_LIBS])
 AC_SUBST([MESA_SOURCE])
 
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
@@ -259,7 +266,7 @@
 if test "$XINERAMA" = yes; then
 	AC_DEFINE(XINERAMA,1,[Support Xinerama extension])
 	AC_DEFINE(PANORAMIX,1,[Internal define for Xinerama])
-	REQUIRED_MODULES="$REQUIRED_MODULES panoramixproto"
+	REQUIRED_MODULES="$REQUIRED_MODULES panoramixext"
 fi
 
 AM_CONDITIONAL(XLOADABLE, [test x$XLOADABLE = xyes])
@@ -356,6 +363,7 @@
 AC_DEFINE_UNQUOTED(COMPILEDDEFAULTFONTPATH, ["$FONTPATH"], [Default font path])
 AC_DEFINE_UNQUOTED(VENDOR_STRING,["$VENDOR_STRING"], [Vendor name])
 AC_DEFINE_UNQUOTED(VENDOR_RELEASE, [$VENDOR_RELEASE], [Vendor release])
+AC_SUBST([MODULEPATH])
 
 dnl
 dnl A bunch of configuration values which shouldn't be optional
@@ -430,10 +438,10 @@
 	KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
 	KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
 	KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $KDRIVE_LIB $KDRIVE_OS_LIB \
-	                  $FB_LIB $MI_LIB $EXTENSION_LIBS $DAMAGE_LIB \
-			  $SHADOW_LIB $XPSTUBS_LIB"
+	                  $FB_LIB $MI_LIB $EXTENSION_LIBS $GLX_LIBS $GLXDDX_LIB \
+			  $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
 	KDRIVE_PURE_INCS="$KDRIVE_INC $DAMAGE_INC $SHADOW_INC $EXTENSION_INCS \
-	                  $FB_INC $MI_INC"
+	                  $GLX_INCS $FB_INC $MI_INC"
 	KDRIVE_LIBS="$KDRIVE_PURE_LIBS $KDRIVE_OS_LIB"
 	KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
 fi
@@ -447,10 +455,10 @@
 if test "$XNESTSERVER" = yes; then
 	PKG_CHECK_MODULES(XNESTSERVER, $XNEST_REQUIRED_MODULES)
 	XNEST_LIBS="$DIX_LIB $OS_LIB $XNEST_LIB \
-	             $EXTENSION_LIBS $MI_LIB \
-		     $EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
+		$EXTENSION_LIBS $GLX_LIBS $GLXDDX_LIB $MI_LIB \
+		$EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
 	XNEST_INCS="$XNEST_INC $XNEST_OS_INC $DAMAGE_INC $SHADOW_INC \
-		     $EXTENSION_INCS $MI_INC"
+		$EXTENSION_INCS $GLX_INCS $MI_INC"
 fi
 AC_SUBST([XNEST_LIBS])
 AC_SUBST([XNEST_INCS])
@@ -462,10 +470,10 @@
 	XWIN_LIB='$(top_builddir)/hw/xwin/libxwin.a'
 	XWIN_INC='-I$(top_srcdir)/hw/xwin'
 	XWIN_LIBS="$DIX_LIB $OS_LIB $XWIN_LIB \
-	             $EXTENSION_LIBS $FB_LIB $MI_LIB \
-		     $EXTENSION_LIBS $SHADOW_LIB $XPSTUBS_LIB -lcygipc"
+		$EXTENSION_LIBS $GLX_LIBS $GLXDDX_LIB $FB_LIB $MI_LIB \
+		$EXTENSION_LIBS $SHADOW_LIB $XPSTUBS_LIB -lcygipc"
 	XWIN_INCS="$XWIN_INC $XWIN_OS_INC $SHADOW_INC \
-		     $EXTENSION_INCS $FB_INC $MI_INC"
+		$EXTENSION_INCS $GLX_INCS $FB_INC $MI_INC"
 fi
 AC_SUBST([XWIN_LIBS])
 AC_SUBST([XWIN_INCS])
@@ -482,33 +490,91 @@
 AC_SUBST([XSDL_INCS])
 AC_SUBST([XSDL_DIRS])
 
+XGL=no
+if test "$XGLSERVER" = yes -o "$XGLXSERVER" = yes -o "$XEGLSERVER" = yes; then
+	XGL=yes
+fi
+
 XGL_LIBS=
 XGL_INCS=
-if test "$XGLSERVER" = yes; then
+XGL_GLXEXT_LIB=
+XGL_GLXEXT_INC=
+AM_CONDITIONAL(XGL, [test "x$XGL" = xyes])
+if test "x$XGL" = xyes; then
 	PKG_CHECK_MODULES(XGLSERVER, $XGL_REQUIRED_MODULES)
+
 	XGL_LIB='$(top_builddir)/hw/xgl/libxgl.a'
 	XGL_INC='-I$(top_srcdir)/hw/xgl'
-	XGL_LIBS="$DIX_LIB $XGL_LIB $OS_LIB $FB_LIB $MI_LIB \
-		  $EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB \
-		  $XPSTUBS_LIB"
-	XGL_INCS="$XGL_INC $DAMAGE_INC $SHADOW_INC \
-		  $EXTENSION_INCS $FB_INC $MI_INC"
+
+	XGL_LIBS="$XGL_LIB $DIX_LIB $OS_LIB $FB_LIB $MI_LIB \
+		$EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
+	XGL_INCS="$XGL_INC $GLX_INCS $DAMAGE_INC $SHADOW_INC $EXTENSION_INCS \
+		$FB_INC $MI_INC"
+
+	if test "$XLOADABLE" = yes; then
+		XGLSERVER_LIBS="$XGLSERVER_LIBS -ldl"
+	fi
+
+	if test "x$GLX" = xyes; then
+		XGL_GLXEXT_LIB='$(top_builddir)/hw/xgl/glxext/libxglglxext.la'
+		XGL_GLXEXT_INC='-I$(top_builddir)/hw/xgl/glxext'
+	fi
 fi
 AC_SUBST([XGL_LIBS])
 AC_SUBST([XGL_INCS])
 
-if test "$XGLSERVER" = yes -a "$XGLXSERVER" = yes; then
-	PKG_CHECK_MODULES(XGLXSERVER, $XGLX_REQUIRED_MODULES)
+XGLX=$XGL
+if test "x$XGLX" = xyes; then
+	if test "$XGLXSERVER" = yes; then
+		PKG_CHECK_MODULES(XGLXSERVER, $XGLX_REQUIRED_MODULES)
+	else
+		PKG_CHECK_MODULES(XGLXSERVER, $XGLX_REQUIRED_MODULES,
+			[], [XGLX=no])
+	fi
 fi
 
-if test "$XGLSERVER" = yes -a "$XEGLSERVER" = yes; then
-        PKG_CHECK_MODULES(XEGLSERVER, $XEGL_REQUIRED_MODULES)
+XGLX_LIBS=
+XGLX_INCS=
+XGLX_MOD_LIBS=
+AM_CONDITIONAL(XGLX, [test "x$XGLX" = xyes])
+if test "x$XGLX" = xyes; then
+	XGLX_LIB='$(top_builddir)/hw/xgl/glx/libxglx.la'
+	XGLX_INC='-I$(top_srcdir)/hw/xgl/glx'
+	XGLX_LIBS="$XGLX_LIB $XGL_LIBS"
+	XGLX_INCS="$XGLX_INC $XGL_GLXEXT_INC $XGL_INCS"
+	XGLX_MOD_LIBS="$XGLX_LIB $XGL_GLXEXT_LIB"
 fi
+AC_SUBST([XGLX_LIBS])
+AC_SUBST([XGLX_INCS])
+AC_SUBST([XGLX_MOD_LIBS])
 
-save_CFLAGS="$CFLAGS"
-CFLAGS="$XSERVER_CFLAGS $CFLAGS"
-AC_CHECK_HEADERS([X11/XF86keysym.h],,,)
-CFLAGS="$save_CFLAGS"
+XEGL=$XGL
+if test "x$XEGL" = xyes; then
+	if test "$XEGLSERVER" = yes; then
+		PKG_CHECK_MODULES(XEGLSERVER, $XEGL_REQUIRED_MODULES)
+	else
+		PKG_CHECK_MODULES(XEGLSERVER, $XEGL_REQUIRED_MODULES,
+			[], [XEGL=no])
+	fi
+fi
+
+XEGL_LIBS=
+XEGL_INCS=
+XEGL_MOD_LIBS=
+AM_CONDITIONAL(XEGL, [test "x$XEGL" = xyes])
+if test "x$XEGL" = xyes; then
+	XEGL_INC='-I$(top_srcdir)/hw/xgl/egl'
+	XEGL_LIB='$(top_builddir)/hw/xgl/egl/libxegl.la'
+	XEGL_LIBS="$XEGL_LIB $XGL_LIBS"
+	XEGL_INCS="$XEGL_INC $XGL_GLXEXT_INC $XGL_INCS"
+	XEGL_MOD_LIBS="$XEGL_LIB $XGL_GLXEXT_LIB"
+fi
+AC_SUBST([XEGL_LIBS])
+AC_SUBST([XEGL_INCS])
+AC_SUBST([XEGL_MOD_LIBS])
+
+
+AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
 
 XSERVER_CFLAGS="$XSERVER_CFLAGS -D_BSD_SOURCE "'-I${top_srcdir}/include -I${top_srcdir}/Xext'
 
@@ -617,6 +683,29 @@
 hw/xnest/Makefile
 hw/xwin/Makefile
 hw/xgl/Makefile
+hw/xgl/glxext/Makefile
+hw/xgl/glxext/module/Makefile
 hw/xgl/glx/Makefile
+hw/xgl/glx/module/Makefile
 hw/xgl/egl/Makefile
+hw/xgl/egl/module/Makefile
 ])
+
+if test "x$XGL" = xyes; then
+	echo ""
+	if test "$XGLSERVER" = yes; then
+		echo "Xgl will be compiled with the following ddx modules:"
+		echo "  xglx: $XGLX"
+		echo "  xegl: $XEGL"
+		echo ""
+		echo "the following stand-alone servers:"
+	else
+		echo "The following stand-alone Xgl servers will be compiled:"
+	fi
+	echo "  Xglx: $XGLXSERVER"
+	echo "  Xegl: $XEGLSERVER"
+	echo ""
+	echo "and the following extension modules:"
+	echo "  glx: $GLX"
+	echo ""
+fi

