Ensure autogen.sh invokes autotools in same order,

and with same arguments, as autoreconf.

SVN-Revision: 1439

diff --git a/build/autogen.sh b/build/autogen.sh
index 1266b3e2c236f9007da6a68cf556463c3ce1553a..03cd65737f9b4bbf57c51ef28734e992f4137a52 100755 (executable)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -12,11 +12,14 @@ if [ \! -f build/version ]; then
 fi
 
 set -xe
-aclocal
-autoheader
-autoconf
+aclocal -I build/autoconf
+
+# Note: --automake flag needed only for libtoolize from
+# libtool 1.5.x; in libtool 2.2.x it is a synonym for --quiet
 case `uname` in
 Darwin) glibtoolize --automake -c;;
 *) libtoolize --automake -c;;
 esac
+autoconf
+autoheader
 automake -a -c