diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-04-07 17:06:52 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-04-07 17:09:18 +0900 |
| commit | fd7808f5a6cec1aa43cbfe0f95ad15ee4f90d2bf (patch) | |
| tree | 53c4083820023117ab0e962a56357a0fe2c9b0a9 /autogen.sh | |
| parent | cdd0b788feb5e393cbf9128bbfa23caf44013060 (diff) | |
| download | external_gettext-fd7808f5a6cec1aa43cbfe0f95ad15ee4f90d2bf.zip external_gettext-fd7808f5a6cec1aa43cbfe0f95ad15ee4f90d2bf.tar.gz external_gettext-fd7808f5a6cec1aa43cbfe0f95ad15ee4f90d2bf.tar.bz2 | |
autogen.sh: Error out when gnulib-tool exit with non-zero
As the local patches to Gnulib tool often fail to apply after updating
the submodule, it would be good to stop processing there.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -161,7 +161,7 @@ if ! $skip_gnulib; then javacomp-script ' $GNULIB_TOOL --dir=gettext-runtime --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --no-libtool --local-dir=gnulib-local --local-symlink \ - --import $GNULIB_MODULES_RUNTIME_FOR_SRC $GNULIB_MODULES_RUNTIME_OTHER + --import $GNULIB_MODULES_RUNTIME_FOR_SRC $GNULIB_MODULES_RUNTIME_OTHER || exit $? # In gettext-runtime/libasprintf: GNULIB_MODULES_LIBASPRINTF=' alloca @@ -172,8 +172,8 @@ if ! $skip_gnulib; then GNULIB_MODULES_LIBASPRINTF_OTHER=' ' $GNULIB_TOOL --dir=gettext-runtime/libasprintf --source-base=. --m4-base=gnulib-m4 --lgpl=2 --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \ - --import $GNULIB_MODULES_LIBASPRINTF $GNULIB_MODULES_LIBASPRINTF_OTHER - $GNULIB_TOOL --copy-file m4/intmax_t.m4 gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 + --import $GNULIB_MODULES_LIBASPRINTF $GNULIB_MODULES_LIBASPRINTF_OTHER || exit $? + $GNULIB_TOOL --copy-file m4/intmax_t.m4 gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 || exit $? # In gettext-tools: GNULIB_MODULES_TOOLS_FOR_SRC=' alloca-opt @@ -319,14 +319,14 @@ if ! $skip_gnulib; then uniwidth/width-tests ' $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \ - --import --avoid=hash-tests `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER + --import --avoid=hash-tests `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER || exit $? # In gettext-tools/libgrep: GNULIB_MODULES_TOOLS_FOR_LIBGREP=' mbrlen regex ' $GNULIB_TOOL --dir=gettext-tools --macro-prefix=grgl --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP --makefile-name=Makefile.gnulib --local-dir=gnulib-local --local-symlink \ - --import `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then echo --avoid=$m; fi; done` $GNULIB_MODULES_TOOLS_FOR_LIBGREP + --import `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then echo --avoid=$m; fi; done` $GNULIB_MODULES_TOOLS_FOR_LIBGREP || exit $? # In gettext-tools/libgettextpo: # This is a subset of the GNULIB_MODULES_FOR_SRC. GNULIB_MODULES_LIBGETTEXTPO=' @@ -377,15 +377,15 @@ if ! $skip_gnulib; then GNULIB_MODULES_LIBGETTEXTPO_OTHER=' ' $GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \ - --import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER - $GNULIB_TOOL --copy-file tests/init.sh gettext-tools + --import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER || exit $? + $GNULIB_TOOL --copy-file tests/init.sh gettext-tools || exit $? fi fi # Fetch config.guess, config.sub. if test -n "$GNULIB_TOOL"; then for file in config.guess config.sub; do - $GNULIB_TOOL --copy-file build-aux/$file; chmod a+x build-aux/$file + $GNULIB_TOOL --copy-file build-aux/$file; chmod a+x build-aux/$file || exit $? done else for file in config.guess config.sub; do |