[xserver-commit] xserver configure.ac,3.53,3.54
Warren Turkal
xserver-commit@pdx.freedesktop.org
Committed by: wt
Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv27606
Modified Files:
configure.ac
Log Message:
Make the shape extension always build
Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.53
retrieving revision 3.54
diff -u -d -r3.53 -r3.54
--- configure.ac 9 Feb 2004 12:45:44 -0000 3.53
+++ configure.ac 12 Feb 2004 18:58:48 -0000 3.54
@@ -85,7 +85,6 @@
EXTENSION_INCS='-I$(top_srcdir)/Xext'
AC_ARG_ENABLE(werror, [ --enable-werror ],[WERROR=$enableval],[WERROR=no])
-AC_ARG_ENABLE(shape, [ --disable-shape ],[SHAPE=$enableval],[SHAPE=yes])
AC_ARG_ENABLE(xv, [ --disable-xv ],[XV=$enableval],[XV=yes])
AC_ARG_ENABLE(composite, [ --disable-composite ],[COMPOSITE=$enableval],[COMPOSITE=yes])
AC_ARG_ENABLE(mitshm, [ --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])
@@ -116,11 +115,6 @@
[ VENDOR_RELEASE="$withval" ],
[ VENDOR_RELEASE="$DEFAULT_VENDOR_RELEASE" ])
-AM_CONDITIONAL(SHAPE, test x$SHAPE = xyes)
-if test "$SHAPE" = yes; then
- AC_DEFINE(SHAPE,1,[Support SHAPE extension])
-fi
-
AM_CONDITIONAL(XV, [test x$XV = xyes])
if test "$XV" = yes; then
AC_DEFINE(XV,1,[Support Xv Extension])