Fix gnulib problems.

diff --git a/ChangeLog b/ChangeLog
index 357233d3a5171044729aaac7748742e12496b610..6792eb90c628b9d30524aef6764f6a10304062ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Sep 17 11:01:44 2005  Ben Pfaff  <blp@gnu.org>
+
+       Adapt to newer versions of gnulib.
+
+       * Smake: Put gnulib options directly on its command line, instead
+       of embedding them in configure.ac.
+
+       * configure.ac: Remove gnulib option commands.
+
 Fri Aug  3 07:22:28 2005  Ben Pfaff  <blp@gnu.org>
 
        * PSPP 0.4.0 released.

diff --git a/Smake b/Smake
index 404eb8a2f3968d9075872e51954fb37e8deaed36..aaeb8c0ba3b992b1336a3d27dda8f4f6c170fdff 100644 (file)
--- a/Smake
+++ b/Smake
@@ -3,10 +3,17 @@
 GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
+GNULIB_MODULES = alloca alloca-opt assert full-read full-write         \
+gethostname getline getlogin_r getopt gettext memchr memcmp memmem     \
+memmove memset progname readlink restrict snprintf stat-macros stdbool \
+stpcpy strcase strcspn strerror strftime strstr strtod strtok_r strtol \
+strtoul vsnprintf xalloc xalloc-die xreadlink
+
 all: po/POTFILES.in
        test -d m4 || mkdir m4
        touch m4/Makefile.am
-       $(GNULIB_TOOL) --import
+       $(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
+               --source-base=gl --lib=libgl --import $(GNULIB_MODULES)
        autoreconf --install
 
 gettextize:

diff --git a/configure.ac b/configure.ac
index f64748657e5a665be377bc6580a56f637c2592c0..6fb870a70598d505965247aa7ca7d194c25b1149 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -97,10 +97,6 @@ AC_CHECK_HEADERS([limits.h memory.h sys/stat.h sys/time.h sys/types.h \
                   fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h] )
 
 # For gnulib.
-gl_LIB(libgl)
-gl_SOURCE_BASE(gl)
-gl_M4_BASE(gl/m4)
-gl_MODULES(alloca alloca-opt assert full-read full-write gethostname getline getlogin_r getopt gettext memchr memcmp memmem memmove memset progname readlink restrict snprintf stat-macros stdbool stpcpy strcase strcspn strerror strftime strstr strtod strtok_r strtol strtoul vsnprintf xalloc xalloc-die xreadlink)
 gl_INIT
 
 AC_C_CONST