Undo last commit.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5a418cffe7772452854383621f9801f997913655..36d4dc1182fbce062aa36a75f92a5a18dc8c448d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #

-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 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


@@ -14,24 +15,24 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301  USA

 
 

-# We need a recent Autoconf to run a recent Autotest.
-AC_PREREQ(2.54)
+# We use macros like AC_CHECK_HEADERS_ONCE, so we need Autoconf 2.60 or better.
+AC_PREREQ(2.60)

 
 

-AC_INIT([GNU Bison], [1.75b], [bug-bison@gnu.org])
-AC_CONFIG_AUX_DIR(config)
+AC_INIT([GNU Bison], [2.3+], [bug-bison@gnu.org])
+AC_CONFIG_AUX_DIR([build-aux])
+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)],


@@ -41,23 +42,43 @@ AC_ARG_ENABLE(gcc-warnings,
  esac],
               [enableval=no])
 if test "${enableval}" = yes; then
  esac],
               [enableval=no])
 if test "${enableval}" = yes; then

-  BISON_WARNING(-Werror)
+  gl_WARNING_CFLAGS([-Werror])

   AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
   WARNING_CFLAGS=
   AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
   WARNING_CFLAGS=

-  BISON_WARNING(-Wall)
-  BISON_WARNING(-W)
-  BISON_WARNING(-Wbad-function-cast)
-  BISON_WARNING(-Wcast-align)
-  BISON_WARNING(-Wcast-qual)
-  BISON_WARNING(-Wformat)
-  BISON_WARNING(-Wmissing-declarations)
-  BISON_WARNING(-Wmissing-prototypes)
-  BISON_WARNING(-Wnested-externs)
-  BISON_WARNING(-Wshadow)
-  BISON_WARNING(-Wstrict-prototypes)
-  BISON_WARNING(-Wwrite-strings)
+  gl_WARNING_CFLAGS([-Wextra -Wno-sign-compare])
+  gl_WARNING_CFLAGS([-Wall])
+  gl_WARNING_CFLAGS([-Wcast-align])
+  gl_WARNING_CFLAGS([-Wcast-qual])
+  gl_WARNING_CFLAGS([-Wformat])
+  gl_WARNING_CFLAGS([-Wpointer-arith])
+  gl_WARNING_CFLAGS([-Wwrite-strings])
+  AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS])
+  # The following warnings are not suitable for C++.
+  gl_WARNING_CFLAGS([-Wbad-function-cast])
+  gl_WARNING_CFLAGS([-Wmissing-declarations])
+  gl_WARNING_CFLAGS([-Wmissing-prototypes])
+  gl_WARNING_CFLAGS([-Wshadow])
+  gl_WARNING_CFLAGS([-Wstrict-prototypes])
+  AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])

 fi
 
 fi
 

+BISON_TEST_FOR_WORKING_C_COMPILER
+
+AC_ARG_ENABLE([yacc],
+  [AC_HELP_STRING([--disable-yacc],
+     [do not build a yacc command or an -ly library])],
+  , [enable_yacc=yes])
+case $enable_yacc in
+yes)
+  YACC_SCRIPT=yacc
+  YACC_LIBRARY=liby.a;;
+*)
+  YACC_SCRIPT=
+  YACC_LIBRARY=;;
+esac
+AC_SUBST([YACC_SCRIPT])
+AC_SUBST([YACC_LIBRARY])
+

 # Checks for programs.
 AC_PROG_LEX
 AC_PROG_YACC
 # Checks for programs.
 AC_PROG_LEX
 AC_PROG_YACC


@@ -69,53 +90,50 @@ 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_HEADER_STDBOOL
+AC_CHECK_HEADERS_ONCE([locale.h])
+AM_STDBOOL_H

 
 # Checks for compiler characteristics.
 AC_C_INLINE
 
 # Checks for library functions.
 
 # Checks for compiler characteristics.
 AC_C_INLINE
 
 # Checks for library functions.

-AC_FUNC_ALLOCA
-AC_FUNC_OBSTACK
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_STRNLEN
-AC_CHECK_FUNCS(setlocale)
-AC_CHECK_DECLS([free, getenv, getopt,
-                stpcpy, strchr, strspn, strnlen,
-                malloc, memchr, memrchr])
-AC_REPLACE_FUNCS(memchr memrchr \
-                 strchr stpcpy strrchr strspn strtol)
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-jm_PREREQ_QUOTEARG
-jm_FUNC_ARGMATCH
-jm_PREREQ_ERROR
+AC_CHECK_FUNCS_ONCE([setlocale])

 AM_WITH_DMALLOC
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
 
 AM_WITH_DMALLOC
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
 

-# Gettext.
-AM_GNU_GETTEXT(external, need-ngettext)
-AM_GNU_GETTEXT_VERSION(0.11.5)
+# gnulib and gettext.
+GNULIB_AUTOCONF_SNIPPET
+# We've never tested with gettext versions before 0.15, so play it safe.
+AM_GNU_GETTEXT_VERSION([0.15])
+BISON_I18N
+
+# Internationalized parsers.
+AC_CONFIG_FILES([runtime-po/Makefile.in])
+# Autoconf macros for packages using internationalized parsers.
+aclocaldir='${datadir}/aclocal'
+AC_SUBST([aclocaldir])

 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/Makefile tests/atlocal])
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/Makefile tests/atlocal])
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])

-AC_CHECK_PROGS([GXX], [g++])
+AC_PROG_CXX
+BISON_TEST_FOR_WORKING_CXX_COMPILER

 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])

-O0CFLAGS=`echo $CFLAGS | sed 's/-O[0-9] *//'`
+O0CFLAGS=`echo $CFLAGS | sed 's/-O[[0-9]] *//'`

 AC_SUBST([O0CFLAGS])
 AC_SUBST([O0CFLAGS])

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

 
 AC_CONFIG_FILES([Makefile
 
 AC_CONFIG_FILES([Makefile

-                 config/Makefile
+                 build-aux/Makefile

                  po/Makefile.in
                  data/Makefile
                  po/Makefile.in
                  data/Makefile

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

 AC_OUTPUT
 AC_OUTPUT