* djgpp/config.sed: Adjustments concerning the use of autoconf 2.61.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3d0a1a3f681dee1ed6eacb199f44fd96ec9857ef..bd9ff0b6a83644b4cb84788e6691937a0fae102c 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,39 +15,25 @@
 #
 # 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 have strange test case titles, so we need Autoconf 2.61 or better.
+AC_PREREQ(2.61)

 
 

-AC_INIT([GNU Bison], [1.49c], [bug-bison@gnu.org])
-AC_CONFIG_AUX_DIR(config)
+AC_INIT([GNU Bison], [2.3a+], [bug-bison@gnu.org])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])

 
 

-AM_INIT_AUTOMAKE([1.6.3 check-news readme-alpha dist-bzip2])
-AM_CONFIG_HEADER(config.h:config.hin)
+# 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([lib/config.h:lib/config.hin])

 
 

-# Initialize the test suite.
-AC_CONFIG_TESTDIR(tests)
-AC_CONFIG_FILES([tests/Makefile tests/atlocal])
-AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
-# Needed by tests/atlocal.in.
-AC_SUBST([GCC])
+# Checks for the compiler.
+AC_PROG_CC_STDC

 
 

-# Checks for programs.
-AC_PROG_CC
-AM_PROG_LEX
-AC_PROG_YACC
-AC_MINIX
-AC_ISC_POSIX
-AM_PROG_CC_STDC
-AC_PROG_RANLIB
-AM_MISSING_PROG([AUTOM4TE], [autom4te])
-BISON_PROG_GNU_M4
-if test x"$ac_cv_prog_gnu_m4" != xyes; then
-  AC_MSG_ERROR([GNU M4 1.4 is required])
-fi
-AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
+# Gnulib (early checks).
+gl_EARLY

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


@@ -56,65 +43,108 @@ 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([-Wall])
+  gl_WARNING_CFLAGS([-Wextra -Wno-sign-compare])
+  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
 

-# Checks for libraries.
-AC_DEFINE([_GNU_SOURCE],1,[Define to 1 for GNU C library extensions.])
+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
+AC_PROG_RANLIB
+BISON_PROG_GNU_M4
+if test x"$ac_cv_prog_gnu_m4" != xyes; then
+  AC_MSG_ERROR([GNU M4 1.4 is required])
+fi
+AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])

 
 # Checks for header files.
 
 # 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])

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

-AC_C_CONST

 AC_C_INLINE
 AC_C_INLINE

-AM_C_PROTOTYPES
+
+# Gnulib (later checks).  Putting them here rather than right after
+# gl_EARLY avoids some redundant checks.
+gl_INIT

 
 # Checks for library functions.
 
 # Checks for library functions.

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

 AM_WITH_DMALLOC
 AM_WITH_DMALLOC

+BISON_PREREQ_SUBPIPE

 BISON_PREREQ_TIMEVAR
 
 # Gettext.
 BISON_PREREQ_TIMEVAR
 
 # Gettext.

-AM_GNU_GETTEXT(external, need-ngettext)
-AM_GNU_GETTEXT_VERSION(0.11.5)
-
-# This is necessary so that .o files in LIBOBJS are also built via
-# the ANSI2KNR-filtering rules.
-LIB@&t@OBJS=`echo $LIB@&t@OBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
-AC_SUBST(LIB@&t@OBJS)
-
-AC_OUTPUT([Makefile
-           config/Makefile
-           po/Makefile.in
-           data/Makefile
-           lib/Makefile src/Makefile doc/Makefile
-           m4/Makefile])
+# We've never tested with gettext versions before 0.15, so play it safe.
+AM_GNU_GETTEXT([external], [need-formatstring-macros])
+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])
+
+# Create the benchmark script.
+AC_CONFIG_FILES([etc/bench.pl], [chmod +x etc/bench.pl])
+
+# 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_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])
+O0CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`
+AC_SUBST([O0CXXFLAGS])
+
+gt_JAVACOMP([1.3])
+gt_JAVAEXEC
+
+AC_CONFIG_FILES([Makefile
+                 build-aux/Makefile
+                 po/Makefile.in
+                 data/Makefile
+                 etc/Makefile
+                examples/Makefile
+                   examples/calc++/Makefile
+                 lib/Makefile src/Makefile doc/Makefile])
+AC_OUTPUT