Fix gnulib problems.

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index 6f0f7cc5251a5b974ff31cdcae673646625f225e..aaeb8c0ba3b992b1336a3d27dda8f4f6c170fdff 100644 (file)
--- a/Smake
+++ b/Smake
@@ -3,11 +3,21 @@
 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
-       $(GNULIB_TOOL) --import
+       test -d m4 || mkdir m4
+       touch m4/Makefile.am
+       $(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
+               --source-base=gl --lib=libgl --import $(GNULIB_MODULES)
        autoreconf --install
 
 gettextize:
+       test -d m4 || mkdir m4
        touch m4/Makefile.am
        gettextize -f -c --intl --no-changelog