Merge "output" into "master"

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index fd936cd1505477a87b1718205ca4b7e2bcbc8d31..ad228ebaa255b8fbe85e9d116ce4734760a7cff0 100644 (file)
--- a/Smake
+++ b/Smake
@@ -5,7 +5,6 @@ GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
 GNULIB_MODULES = \
-       argp \
        assert \
        byteswap \
        c-ctype \
@@ -81,6 +80,8 @@ GNULIB_MODULES = \
        unistr/u8-strncat \
        unlocked-io \
        vasprintf-posix \
+       version-etc \
+       version-etc-fsf \
        vfprintf-posix \
        vprintf-posix \
        vsnprintf \
@@ -105,7 +106,6 @@ all:
        echo '*' > gl/.cvsignore
        echo '*' > gl/m4/.cvsignore
        libtoolize --force --automake
-       autopoint --force
        aclocal -I m4 -I gl/m4
        autoconf
        autoheader