xserver configure.ac,3.98,3.99

Committed by: jonsmirl

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

Modified Files:
	configure.ac 
Log Message:
Enable egl server in automake
--enable-xeglserver


Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.98
retrieving revision 3.99
diff -u -d -r3.98 -r3.99
--- configure.ac	15 Apr 2005 22:29:44 -0000	3.98
+++ configure.ac	5 Jun 2005 01:58:41 -0000	3.99
@@ -100,6 +100,7 @@
 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(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 ],
@@ -195,6 +196,12 @@
 	XGLX_REQUIRED_MODULES="glitz-glx >= 0.4.2 xrender >= 0.5.0"
 fi
 
+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.2 xrender >= 0.5.0"
+fi
+
 AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
 if test "$XTRAP" = yes; then
 	AC_DEFINE(XTRAP,1,[Support XTrap extension])
@@ -306,7 +313,7 @@
 	AC_DEFINE(TSLIB,1,[Support tslib touchscreen abstraction library])
 else
 
-dnl Make sure tslib and ipaq ts dont *both* get enabled.  
+dnl Make sure tslib and ipaq ts dont *both* get enabled.
 
 	if test "$ac_cv_header_linux_h3600_ts_h" = yes; then
 	   AC_DEFINE(H3600_TS, 1, [Include handhelds.org h3600 touchscreen driver])
@@ -496,6 +503,15 @@
 fi
 AC_SUBST([XGLX_DIRS])
 
+XEGL_DIRS=
+if test "$XGLSERVER" = yes -a "$XEGLSERVER" = yes; then
+        PKG_CHECK_MODULES(XEGLSERVER, $XEGL_REQUIRED_MODULES)
+        XEGL_LIBS="-lEGL"
+        XEGL_DIRS=egl
+fi
+AC_SUBST([XEGL_LIBS])
+AC_SUBST([XEGL_DIRS])
+
 AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
 
 XSERVER_CFLAGS="$XSERVER_CFLAGS -D_BSD_SOURCE "'-I${top_srcdir}/include -I${top_srcdir}/Xext'
@@ -524,7 +540,7 @@
 }
 ],
  [AC_DEFINE(WORKING_UNALIGNED_INT, 1, [unaligned word accesses behave as expected])
-  AC_MSG_RESULT(yes)], 
+  AC_MSG_RESULT(yes)],
  AC_MSG_RESULT(no),
  AC_MSG_RESULT(assuming not on target machine))
 
@@ -604,4 +620,5 @@
 hw/xwin/Makefile
 hw/xgl/Makefile
 hw/xgl/glx/Makefile
+hw/xgl/egl/Makefile
 ])