More changes to pacify C++ compilers.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7de00628fa9901f27a93d52379a1164f728abb57..1bf79a08ca70f6a77ad83d5a81c97e7bee144336 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 AC_PREREQ(2.59)
 
 AC_INIT([GNU Bison], [2.0a], [bug-bison@gnu.org])
 AC_PREREQ(2.59)
 
 AC_INIT([GNU Bison], [2.0a], [bug-bison@gnu.org])

-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([build-aux])

 AC_CONFIG_MACRO_DIR([m4])
 
 # We don't have a file m4/Makefile.am, so we need Automake 1.8 or later.
 AC_CONFIG_MACRO_DIR([m4])
 
 # We don't have a file m4/Makefile.am, so we need Automake 1.8 or later.


@@ -107,8 +107,15 @@ BISON_PREREQ_TIMEVAR
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET

-# We use po/Makevars.template, so we need at least gettext 0.12.
+# We use po/Makevars, so we need at least gettext 0.12.

 AM_GNU_GETTEXT_VERSION([0.12])
 AM_GNU_GETTEXT_VERSION([0.12])

+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)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)


@@ -129,5 +136,7 @@ AC_CONFIG_FILES([Makefile
                  config/Makefile
                  po/Makefile.in
                  data/Makefile
                  config/Makefile
                  po/Makefile.in
                  data/Makefile

+                examples/Makefile
+                   examples/calc++/Makefile

                  lib/Makefile src/Makefile doc/Makefile])
 AC_OUTPUT
                  lib/Makefile src/Makefile doc/Makefile])
 AC_OUTPUT