* data/bison.c++: Merge the two generated headers. Insert a copyright

[bison.git] / configure.in

diff --git a/configure.in b/configure.in
index b68768b58920642907fceae3a89b22219aede77d..654caf2914064dc155516eac226c33d0447b31f5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,11 @@ AC_ISC_POSIX
 AM_PROG_CC_STDC
 AC_PROG_RANLIB
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 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.])

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


@@ -89,8 +94,9 @@ AC_FUNC_ALLOCA
 AC_FUNC_OBSTACK
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_STRNLEN
 AC_FUNC_OBSTACK
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_STRNLEN

-AC_CHECK_FUNCS(mkstemp setlocale)
-AC_CHECK_DECLS([stpcpy, strchr, strspn, strnlen, memchr, memrchr])
+UTILS_FUNC_MKSTEMP
+AC_CHECK_FUNCS(setlocale)
+AC_CHECK_DECLS([free, stpcpy, strchr, strspn, strnlen, malloc, memchr, memrchr])

 AC_REPLACE_FUNCS(stpcpy strchr strspn memchr memrchr)
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 AC_REPLACE_FUNCS(stpcpy strchr strspn memchr memrchr)
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC


@@ -98,7 +104,7 @@ jm_PREREQ_QUOTEARG
 jm_PREREQ_ERROR
 AM_WITH_DMALLOC
 
 jm_PREREQ_ERROR
 AM_WITH_DMALLOC
 

-ALL_LINGUAS="de es et fr ja nl ru sv tr"
+ALL_LINGUAS="de es et fr it ja nl ru sv tr"

 AM_GNU_GETTEXT(, need-ngettext)
 
 # This is necessary so that .o files in LIBOBJS are also built via
 AM_GNU_GETTEXT(, need-ngettext)
 
 # This is necessary so that .o files in LIBOBJS are also built via


@@ -109,5 +115,6 @@ AC_SUBST(LIB@&t@OBJS)
 AC_OUTPUT([Makefile
            config/Makefile
            intl/Makefile po/Makefile.in
 AC_OUTPUT([Makefile
            config/Makefile
            intl/Makefile po/Makefile.in

+           data/Makefile

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