Integrate Gnulib non-recursively.

[cdecl99.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e749f5300ff7354b4bed2e10c0c118bbfa5d8b1f..50eaf75df4cc48a37264ce15d53f2f4a457d4920 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,15 @@ gl_EARLY
 LT_INIT
 gl_INIT
 
+DX_FIX_GNULIB
+
+dnl We provide our own makefile rules for gettext.  Disable tracing of
+dnl AM_GNU_GETTEXT to prevent autoreconf from running autopoint, and to
+dnl prevent automake from growing gratuitous error conditions.
+m4_traceoff([AM_GNU_GETTEXT])
+AM_GNU_GETTEXT([external])
+DX_LINGUAS
+
 AC_ARG_VAR([FLEX], [Command to invoke flex.  Defaults to flex.])
 AC_ARG_VAR([FLEXFLAGS], [Additional options to pass to flex.])
 AC_CHECK_PROGS([FLEX], [flex], [flex])
@@ -25,9 +34,9 @@ AC_CHECK_PROGS([FLEX], [flex], [flex])
 AC_ARG_VAR([BISON], [Command to invoke GNU Bison.  Defaults to bison.])
 AC_ARG_VAR([BISONFLAGS], [Additional options to pass to Bison.])
 AC_CHECK_PROGS([BISON], [bison], [bison])
+BISON_I18N
 
 AC_CONFIG_FILES([
-       lib/Makefile
        Makefile
 ])
 AC_OUTPUT