-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 use gnulib, which is only guaranteed to work properly with the
+# latest Gettext.
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.18])
+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])
+case $VALGRIND:$host_os in
+ '':*) ;;
+ *:darwin*)
+ # See README-hacking.
+ # VALGRIND+=' --suppressions=$(abs_top_srcdir)/build-aux/darwin11.4.0.valgrind'
+ VALGRIND=;;
+ *:*)
+ AC_SUBST([VALGRIND_PREBISON], ["$VALGRIND -q"]);;
+esac
+
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+# Needed by tests/atlocal.in.
+AC_SUBST([GCC])
+
+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
+ doc/yacc.1])
+AC_OUTPUT