Sync with GNU tar.

[bison.git] / configure.in

diff --git a/configure.in b/configure.in
index 3e5f284dd7e00a8e83f8d6ebe03c854bc2f55ef7..115b8671d0766513b3d4123751e2fb4c6ec02c41 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,7 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #

+# Copyright (C) 2001, 2002 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
 # the Free Software Foundation; either version 2 of the License, or
 # 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
 # the Free Software Foundation; either version 2 of the License, or


@@ -16,33 +18,35 @@
 # 02111-1307  USA
 
 # We need a recent Autoconf to run a recent Autotest.
 # 02111-1307  USA
 
 # We need a recent Autoconf to run a recent Autotest.

-AC_PREREQ(2.52e)
+AC_PREREQ(2.53)

 
 

-AC_INIT([GNU Bison], [1.49a], [bug-bison@gnu.org])
+AC_INIT([GNU Bison], [1.49b], [bug-bison@gnu.org])

 AC_CONFIG_AUX_DIR(config)
 
 AC_CONFIG_AUX_DIR(config)
 

-AM_INIT_AUTOMAKE([bison], [1.49a])
+AM_INIT_AUTOMAKE

 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)

-AC_CONFIG_FILES(tests/Makefile tests/atlocal)
+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 programs.
 AC_PROG_CC
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
 
 # Checks for programs.
 AC_PROG_CC

+AM_PROG_LEX
+AC_PROG_YACC

 AC_MINIX
 AC_ISC_POSIX
 AM_PROG_CC_STDC
 AC_PROG_RANLIB
 AC_MINIX
 AC_ISC_POSIX
 AM_PROG_CC_STDC
 AC_PROG_RANLIB

-# GNU M4 is needed to build the testsuite.
-BISON_AC_PROG_GNU_M4
-if test "$ac_cv_prog_gnu_m4" != yes; then
-  missing_dir=`cd $ac_aux_dir && pwd`
-  M4="$missing_dir/missing m4"
+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
 fi

+AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])

 
 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)],


@@ -52,6 +56,9 @@ AC_ARG_ENABLE(gcc-warnings,
  esac],
               [enableval=no])
 if test "${enableval}" = yes; then
  esac],
               [enableval=no])
 if test "${enableval}" = yes; then

+  BISON_WARNING(-Werror)
+  AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
+  WARNING_CFLAGS=

   BISON_WARNING(-Wall)
   BISON_WARNING(-W)
   BISON_WARNING(-Wbad-function-cast)
   BISON_WARNING(-Wall)
   BISON_WARNING(-W)
   BISON_WARNING(-Wbad-function-cast)


@@ -64,7 +71,6 @@ if test "${enableval}" = yes; then
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)

-  CFLAGS="$CFLAGS $WARNING_CFLAGS"

 fi
 
 # Checks for libraries.
 fi
 
 # Checks for libraries.


@@ -72,11 +78,7 @@ AC_DEFINE([_GNU_SOURCE],1,[Define to 1 for GNU C library extensions.])
 
 # Checks for header files.
 AC_HEADER_STDC
 
 # Checks for header files.
 AC_HEADER_STDC

-AC_CHECK_HEADERS(ctype.h locale.h memory.h stdlib.h string.h unistd.h)
-
-# Checks for typedefs.
-
-# Checks for structures.
+AC_CHECK_HEADERS([ctype.h locale.h memory.h stdlib.h string.h unistd.h])

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


@@ -85,25 +87,33 @@ AM_C_PROTOTYPES
 
 # Checks for library functions.
 AC_FUNC_ALLOCA
 
 # Checks for library functions.
 AC_FUNC_ALLOCA

-AC_CHECK_FUNCS(mkstemp setlocale)
-AC_CHECK_DECLS([stpcpy, strndup, strnlen, memchr])
-AC_REPLACE_FUNCS(stpcpy strndup strnlen strspn memchr)
+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)

 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 jm_PREREQ_QUOTEARG
 jm_PREREQ_ERROR
 AM_WITH_DMALLOC
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 jm_PREREQ_QUOTEARG
 jm_PREREQ_ERROR
 AM_WITH_DMALLOC

+BISON_PREREQ_TIMEVAR

 
 

-ALL_LINGUAS="de es et fr ja nl tr ru"
-AM_GNU_GETTEXT
+# 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.
 
 # This is necessary so that .o files in LIBOBJS are also built via
 # the ANSI2KNR-filtering rules.

-LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
-AC_SUBST(LIBOBJS)
+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
 
 AC_OUTPUT([Makefile
            config/Makefile

-           intl/Makefile po/Makefile.in
+           po/Makefile.in
+           data/Makefile

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