2002-08-18 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
both automake 1.6 and 1.4 installed get the right automake. Means
compilation from CVS will now require the latest automake 1.4
release, or manually creating symlinks called "automake-1.4" and
"aclocal-1.4"
svn path=/trunk/; revision=2565
+2002-08-18 Havoc Pennington <hp@pobox.com>
+
+ * autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
+ both automake 1.6 and 1.4 installed get the right automake. Means
+ compilation from CVS will now require the latest automake 1.4
+ release, or manually creating symlinks called "automake-1.4" and
+ "aclocal-1.4"
+
Mon Aug 12 23:49:41 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* autogen.sh : use portable -o instead of GNU-ish -or for find test
Mon Aug 12 23:49:41 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* autogen.sh : use portable -o instead of GNU-ish -or for find test
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(automake-1.4 --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
echo
echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
# if no automake, don't bother testing for aclocal
# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (aclocal-1.4 --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: Missing \`aclocal'. The version of \`automake'"
echo "installed doesn't appear recent enough."
echo
echo "**Error**: Missing \`aclocal'. The version of \`automake'"
echo "installed doesn't appear recent enough."
libtoolize --force --copy
fi
fi
libtoolize --force --copy
fi
fi
echo "Running aclocal $aclocalinclude ..."
echo "Running aclocal $aclocalinclude ..."
- aclocal $aclocalinclude
+ aclocal-1.4 $aclocalinclude
if grep "^AM_CONFIG_HEADER" $bn >/dev/null; then
echo "Running autoheader..."
autoheader
fi
echo "Running automake --gnu $am_opt ..."
if grep "^AM_CONFIG_HEADER" $bn >/dev/null; then
echo "Running autoheader..."
autoheader
fi
echo "Running automake --gnu $am_opt ..."
- automake --add-missing --gnu $am_opt
+ automake-1.4 --add-missing --gnu $am_opt
echo "Running autoconf ..."
autoconf
)
echo "Running autoconf ..."
autoconf
)