Bump autoconf dependency to 2.57 from 2.53. Add 2.57 compatibility hack for

the new AS_HELP_STRING syntax from 2.58+.
This commit is contained in:
Adam Jackson 2005-08-01 22:13:20 +00:00
parent b7a43fa0f1
commit 2acd29c93f

View File

@ -23,7 +23,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl dnl
dnl Process this file with autoconf to create configure. 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 we aren't intelligent about padding the version, so it always has to be four
dnl digits. ho hum. dnl digits. ho hum.
AC_INIT([xorg-server], 6.99.99.900, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) 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' EXTENSION_INCS='-I$(top_srcdir)/Xext'
AC_DEFINE(XORG_SERVER, 1, [Build X.Org X server]) 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(werror, [ --enable-werror ],[WERROR=$enableval],[WERROR=no])
AC_ARG_ENABLE(composite, [ --enable-composite ],[COMPOSITE=$enableval],[COMPOSITE=no]) AC_ARG_ENABLE(composite, [ --enable-composite ],[COMPOSITE=$enableval],[COMPOSITE=no])
AC_ARG_ENABLE(mitshm, [ --disable-shm ],[MITSHM=$enableval],[MITSHM=yes]) AC_ARG_ENABLE(mitshm, [ --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])