Improve order of autotools calls

This commit is contained in:
whydoubt 2005-03-31 05:22:13 +00:00
parent f1856c82f5
commit 2ba6143d9b
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,6 @@
Wed Mar 30 23:21:25 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* autogen.sh: Improve order of autotools calls
Mon Mar 28 21:31:36 CST 2005 Jeff Smith <whydoubt@yahoo.com> Mon Mar 28 21:31:36 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* acinclude.m4: * acinclude.m4:
* src/util/Makefile.am: Only mdb-sql depends on readline * src/util/Makefile.am: Only mdb-sql depends on readline

View File

@ -74,12 +74,14 @@ if test "$DIE" -eq 1; then
exit 1 exit 1
fi fi
if test x$NOCONFIGURE = x; then
if test -z "$*"; then if test -z "$*"; then
echo "**Warning**: I am going to run \`configure' with no arguments." echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the" echo "If you wish to pass any to it, please specify them on the"
echo \`$0\'" command line." echo \`$0\'" command line."
echo echo
fi fi
fi
case $CC in case $CC in
xlc ) xlc )
@ -123,18 +125,18 @@ do
echo "Making $dr/aclocal.m4 writable ..." echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi fi
echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude
if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
echo "Running libtoolize..." echo "Running libtoolize..."
libtoolize --force --copy libtoolize --force --copy
fi fi
echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude
if grep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null; then if grep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..." echo "Running autoheader..."
autoheader autoheader
fi fi
echo "Running automake --gnu $am_opt ..." echo "Running automake --gnu $am_opt ..."
automake --add-missing --gnu $am_opt automake --add-missing --gnu --copy $am_opt
echo "Running autoconf ..." echo "Running autoconf ..."
autoconf autoconf
) )