.cvsignore fixes to accommodate gnulib changes,

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ba1b0e29c1e27695d2eb9d7006fad5a10e43ff2c..4b3737f95513fe115a7fec09c6f1fc71d5793e24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #

-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -17,21 +17,24 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 

-# We need a recent Autoconf to run a recent Autotest.
-AC_PREREQ(2.57)
+# This file uses AC_CONFIG_MACRO_DIR, so we need Autoconf 2.58 or better.
+# But Autoconf 2.58 has a bug in the way that it generates tests: it
+# puts the wrong absolute path names in the tests.  So we need at
+# least Autoconf 2.59.
+AC_PREREQ(2.59)

 
 

-AC_INIT([GNU Bison], [1.875b], [bug-bison@gnu.org])
-AC_CONFIG_AUX_DIR(config)
+AC_INIT([GNU Bison], [1.875e], [bug-bison@gnu.org])
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([m4])

 
 

-AM_INIT_AUTOMAKE([1.7 check-news readme-alpha dist-bzip2])
+# We don't have a file m4/Makefile.am, so we need Automake 1.8 or later.
+AM_INIT_AUTOMAKE([1.8 check-news readme-alpha dist-bzip2])

 AC_CONFIG_HEADERS([config.h:config.hin])
 
 AC_CONFIG_HEADERS([config.h:config.hin])
 

+gl_USE_SYSTEM_EXTENSIONS
+

 # Checks for the compiler.
 AC_PROG_CC
 # Checks for the compiler.
 AC_PROG_CC

-# Remove with Automake 1.8.
-AC_ISC_POSIX
-AC_GNU_SOURCE
-AC_MINIX

 AM_PROG_CC_STDC
 AC_ARG_ENABLE(gcc-warnings,
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],
 AM_PROG_CC_STDC
 AC_ARG_ENABLE(gcc-warnings,
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],


@@ -44,20 +47,20 @@ if test "${enableval}" = yes; then
   BISON_WARNING(-Werror)
   AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
   WARNING_CFLAGS=
   BISON_WARNING(-Werror)
   AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
   WARNING_CFLAGS=

-  BISON_WARNING(-Wall)

   BISON_WARNING(-W)
   BISON_WARNING(-W)

+  BISON_WARNING(-Wall)

   BISON_WARNING(-Wcast-align)
   BISON_WARNING(-Wcast-qual)
   BISON_WARNING(-Wformat)
   BISON_WARNING(-Wcast-align)
   BISON_WARNING(-Wcast-qual)
   BISON_WARNING(-Wformat)

-  BISON_WARNING(-Wmissing-prototypes)
-  BISON_WARNING(-Wshadow)
-  BISON_WARNING(-Wstrict-prototypes)

   BISON_WARNING(-Wwrite-strings)
   AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS])
   # The following warnings are not suitable for C++.
   BISON_WARNING(-Wbad-function-cast)
   BISON_WARNING(-Wmissing-declarations)
   BISON_WARNING(-Wwrite-strings)
   AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS])
   # The following warnings are not suitable for C++.
   BISON_WARNING(-Wbad-function-cast)
   BISON_WARNING(-Wmissing-declarations)

+  BISON_WARNING(-Wmissing-prototypes)

   BISON_WARNING(-Wnested-externs)
   BISON_WARNING(-Wnested-externs)

+  BISON_WARNING(-Wshadow)
+  BISON_WARNING(-Wstrict-prototypes)

   AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])
 fi
 
   AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])
 fi
 


@@ -87,8 +90,7 @@ fi
 AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
 
 # Checks for header files.
 AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
 
 # Checks for header files.

-AC_HEADER_STDC
-AC_CHECK_HEADERS([ctype.h locale.h memory.h stdlib.h string.h unistd.h])
+AC_CHECK_HEADERS_ONCE([locale.h])

 AM_STDBOOL_H
 
 # Checks for compiler characteristics.
 AM_STDBOOL_H
 
 # Checks for compiler characteristics.


@@ -98,36 +100,15 @@ AC_C_INLINE
 AC_CHECK_TYPES([uintptr_t])
 
 # Checks for library functions.
 AC_CHECK_TYPES([uintptr_t])
 
 # Checks for library functions.

-AC_CHECK_FUNCS(setlocale)
-AC_CHECK_DECLS([free, getenv, getopt,
-                stpcpy, strchr, strspn, strnlen,
-                malloc, memchr, memrchr])
-AC_REPLACE_FUNCS(strchr strrchr strspn)
+AC_CHECK_FUNCS_ONCE([setlocale])

 AM_WITH_DMALLOC
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
 AM_WITH_DMALLOC
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR

-gl_DIRNAME
-gl_ERROR
-gl_FUNC_ALLOCA
-gl_FUNC_MEMCHR
-gl_FUNC_MEMRCHR
-gl_FUNC_STPCPY
-gl_FUNC_STRNLEN
-gl_FUNC_STRTOL
-gl_GETOPT
-gl_HASH
-gl_MBSWIDTH
-gl_OBSTACK
-gl_QUOTE
-gl_QUOTEARG
-gl_XALLOC
-jm_FUNC_GLIBC_UNLOCKED_IO
-jm_FUNC_MALLOC
-jm_FUNC_REALLOC

 
 

-# Gettext.
-AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.12.1)
+# gnulib and gettext.
+GNULIB_AUTOCONF_SNIPPET
+# We use po/Makevars.template, so we need at least gettext 0.12.
+AM_GNU_GETTEXT_VERSION([0.12])

 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)


@@ -135,16 +116,18 @@ AC_CONFIG_FILES([tests/Makefile tests/atlocal])
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])
 AC_PROG_CXX
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])
 AC_PROG_CXX

+BISON_TEST_FOR_WORKING_CXX_COMPILER

 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
 O0CFLAGS=`echo $CFLAGS | sed 's/-O[0-9] *//'`
 AC_SUBST([O0CFLAGS])
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
 O0CFLAGS=`echo $CFLAGS | sed 's/-O[0-9] *//'`
 AC_SUBST([O0CFLAGS])

+O0CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[0-9] *//'`
+AC_SUBST([O0CXXFLAGS])

 
 AC_CONFIG_FILES([Makefile
                  config/Makefile
                  po/Makefile.in
                  data/Makefile
 
 AC_CONFIG_FILES([Makefile
                  config/Makefile
                  po/Makefile.in
                  data/Makefile

-                 lib/Makefile src/Makefile doc/Makefile
-                 m4/Makefile])
+                 lib/Makefile src/Makefile doc/Makefile])

 AC_OUTPUT
 AC_OUTPUT