summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-08-01 22:13:20 +0000
committerAdam Jackson <ajax@nwnk.net>2005-08-01 22:13:20 +0000
commit2acd29c93fd3b3d438887f0ca9be6713db81c1e8 (patch)
treea6c494d6db9250c1c49088dba23e415af786df1b /configure.ac
parentb7a43fa0f112d92cce71642142e07276da4de681 (diff)
Bump autoconf dependency to 2.57 from 2.53. Add 2.57 compatibility hack for
the new AS_HELP_STRING syntax from 2.58+.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 53f9dc39a..3fc23672c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ(2.53)
+AC_PREREQ(2.57)
dnl we aren't intelligent about padding the version, so it always has to be four
dnl digits. ho hum.
AC_INIT([xorg-server], 6.99.99.900, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
@@ -142,6 +142,8 @@ DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/libre
EXTENSION_INCS='-I$(top_srcdir)/Xext'
AC_DEFINE(XORG_SERVER, 1, [Build X.Org X server])
+m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+
AC_ARG_ENABLE(werror, [ --enable-werror ],[WERROR=$enableval],[WERROR=no])
AC_ARG_ENABLE(composite, [ --enable-composite ],[COMPOSITE=$enableval],[COMPOSITE=no])
AC_ARG_ENABLE(mitshm, [ --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])