Smake: Use glibtoolize instead of libtoolize, if it is available.

[pspp] / Smake

diff --git a/Smake b/Smake
index acd93102be0632c517e739bfa116cbe2c8e5a5eb..47821265bce4796e052d8fe2789939fc4e0e7b8e 100644 (file)
--- a/Smake
+++ b/Smake
@@ -7,10 +7,12 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
        assert \
        byteswap \
+       c-snprintf \
        c-strcase \
        c-strcasestr \
        c-ctype \
        c-strtod \
+       c-xvasprintf \
        clean-temp \
        close \
        configmake \
@@ -46,11 +48,13 @@ GNULIB_MODULES = \
         mbiter \
        memcasecmp \
        memchr \
+       memchr2 \
        mempcpy \
        memrchr \
        minmax \
        mkdtemp \
        mkstemp \
+       pipe2 \
        printf-posix \
        printf-safe \
        progname \
@@ -60,12 +64,14 @@ GNULIB_MODULES = \
        relocatable-prog \
        rename \
        round \
+       select \
        snprintf \
        snprintf-posix \
        sprintf-posix \
        stdarg \
        stdbool \
        stdint \
+       strcasestr \
        stpcpy \
        strerror \
        strftime \
@@ -74,11 +80,15 @@ GNULIB_MODULES = \
        sys_stat \
        tempname \
        trunc \
+       unicase/u8-casecmp \
+       unicase/u8-casefold \
+       unicase/u8-tolower \
+       unicase/u8-toupper \
        unictype/ctype-print \
-       unictype/property-id-continue \
-       unictype/property-id-start \
+       unictype/category-of \
        unigbrk/uc-is-grapheme-break \
        unilbrk/u8-possible-linebreaks \
+       uninorm/nfkd \
        unistd \
        unistr/u8-check \
        unistr/u8-cpy \
@@ -108,22 +118,39 @@ GNULIB_MODULES = \
        xstrndup \
        xvasprintf
 
-all: 
+all: prep_ph
+       $(MAKE) -f Smake Makefile.in configure
+
+.PHONY: prep_ph
+prep_ph: 
        test -e ChangeLog || touch ChangeLog
        test -d m4 || mkdir m4
        touch m4/Makefile.am
-       $(MAKE) -f Smake gnulib
-       libtoolize --force --automake
+       $(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
+               --source-base=gl --lib=libgl --tests-base=tests \
+               --doc-base=gl/doc --aux-dir=build-aux  \
+               --libtool $(GNULIB_MODULES)
+       if (glibtoolize --version) >/dev/null 2>&1; then        \
+               LIBTOOLIZE=glibtoolize;                         \
+       elif (libtoolize --version) >/dev/null 2>&1; then       \
+               LIBTOOLIZE=libtoolize;                          \
+       else                                                    \
+               echo >&2 "libtoolize not found";                \
+               exit 1;                                         \
+       fi;                                                     \
+       $$LIBTOOLIZE --force --automake
+
+aclocal.m4:
        aclocal -I m4 -I gl/m4
+
+configure: configure.ac aclocal.m4
        autoconf
+
+config.h.in: configure.ac
        autoheader
-       automake --add-missing --copy --no-force
 
-gnulib:
-       $(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
-               --source-base=gl --lib=libgl --tests-base=tests \
-               --doc-base=gl/doc --aux-dir=build-aux --import \
-               --libtool $(GNULIB_MODULES)
+Makefile.in: Makefile.am config.h.in aclocal.m4
+       automake --add-missing --copy --no-force --include-deps
 
 
 gettextize: