Imported Upstream version 2.5.2p1

[debian/amanda] / autogen

diff --git a/autogen b/autogen
index 2da35923b644bb8df27e54dd38c7fb15c3c6d628..e15c807cb6ce84813a00429034d6c4d15981d557 100755 (executable)
--- a/autogen
+++ b/autogen
@@ -8,12 +8,12 @@ cd `dirname $0`
 touch config/config.h.in
 
 if test x`ls -1t acinclude.m4 2>/dev/null \
-           config/acinclude.m4i config/libtool.m4i |
+           config/gnulib.m4i config/acinclude.m4i config/libtool.m4i |
          sed 1q` != x"acinclude.m4"; then
     rm -f acinclude.m4
-    cat config/acinclude.m4i config/libtool.m4i > acinclude.m4
+    # keep libtool.m4i first here, as it has a "serial number" comment that it wants
+    # first in the file
+    cat config/libtool.m4i config/gnulib.m4i config/acinclude.m4i > acinclude.m4
 fi
 
-autoreconf --warning=syntax --force ${1+"$@"}
-
-exit 0
+autoreconf --warning=syntax --warning=no-portability --force ${1+"$@"} || exit 1