[xserver-commit] xserver configure.ac,3.47,3.48

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv17098

Modified Files:
	configure.ac 
Log Message:
Add configuration options for --enable-xwinserver.  Tweak Makefile.am's to allow hw/xwin to be built, sort of.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.47
retrieving revision 3.48
diff -u -d -r3.47 -r3.48
--- configure.ac	9 Jan 2004 01:36:22 -0000	3.47
+++ configure.ac	13 Jan 2004 01:43:37 -0000	3.48
@@ -92,6 +92,7 @@
 AC_ARG_ENABLE(xres,          [  --disable-res ],[RES=$enableval],[RES=yes])
 AC_ARG_ENABLE(kdriveserver,  [  --disable-kdriveserver ],[KDRIVESERVER=$enableval],[KDRIVESERVER=yes])
 AC_ARG_ENABLE(xnestserver,   [  --disable-xnestserver ],[XNESTSERVER=$enableval],[XNESTSERVER=yes])
+AC_ARG_ENABLE(xwinserver,    [  --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=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 ],
@@ -143,6 +144,12 @@
 	XNEST_REQUIRED_MODULES="x11 xext"
 fi
 
+AM_CONDITIONAL(XWINSERVER, [test x$XWINSERVER = xyes])
+if test "$XWINSERVER" = yes; then
+	AC_DEFINE(XWINSERVER,,[Build XWin server])
+	XWIN_REQUIRED_MODULES="x11"
+fi
+
 AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
 if test "$XTRAP" = yes; then
 	AC_DEFINE(XTRAP,1,[Support XTrap extension])
@@ -296,18 +303,6 @@
 XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
 
 PKG_CHECK_MODULES(XSERVER, $REQUIRED_MODULES)
-XNEST_LIBS=
-XNEST_INCS=
-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"
-	XNEST_INCS="$XNEST_INC $XNEST_OS_INC $DAMAGE_INC $SHADOW_INC \
-		     $EXTENSION_INCS $MI_INC"
-fi
-AC_SUBST([XNEST_LIBS])
-AC_SUBST([XNEST_INCS])
 
 KDRIVE_LIBS=
 KDRIVE_INCS=
@@ -326,6 +321,34 @@
 AC_SUBST([KDRIVE_LIBS])
 AC_SUBST([KDRIVE_INCS])
 
+XNEST_LIBS=
+XNEST_INCS=
+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"
+	XNEST_INCS="$XNEST_INC $XNEST_OS_INC $DAMAGE_INC $SHADOW_INC \
+		     $EXTENSION_INCS $MI_INC"
+fi
+AC_SUBST([XNEST_LIBS])
+AC_SUBST([XNEST_INCS])
+
+XWIN_LIBS=
+XWIN_INCS=
+if test "$XWINSERVER" = yes; then
+	PKG_CHECK_MODULES(XWINSERVER, $XWIN_REQUIRED_MODULES)
+	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"
+	XWIN_INCS="$XWIN_INC $XWIN_OS_INC $SHADOW_INC \
+		     $EXTENSION_INCS $FB_INC $MI_INC"
+fi
+AC_SUBST([XWIN_LIBS])
+AC_SUBST([XWIN_INCS])
+
 AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
 
 XSERVER_CFLAGS="$XSERVER_CFLAGS "'-I${top_srcdir}/include'
@@ -390,4 +413,5 @@
 hw/kdrive/r128/Makefile
 hw/kdrive/chips/Makefile
 hw/xnest/Makefile
+hw/xwin/Makefile
 ])