summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-08-18 22:21:32 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-08-18 22:21:32 +0000
commitdf9642557a59b72ebe0525005b811d7d3e992393 (patch)
treeafc04b258b406d3302f2023849b824fcbc22243e /autogen.sh
parent6aa23b11d45a0ddb5fbb758c043069ad62592e26 (diff)
downloadatk-df9642557a59b72ebe0525005b811d7d3e992393.tar.gz
hardcode aclocal-1.4/automake-1.4 so that users with both automake 1.6 and
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"
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index 2a3d3cb..fe05456 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,7 +38,7 @@ fi
}
have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
case $automake_version in
1.2*|1.3*|1.4)
@@ -72,9 +72,9 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
fi
fi
-aclocal $ACLOCAL_FLAGS
+aclocal-1.4 $ACLOCAL_FLAGS
-automake -a $am_opt
+automake-1.4 -a $am_opt
autoconf
cd $ORIGDIR