diff options
| author | jacob berkman <jacob@ximian.com> | 2002-09-05 20:00:07 +0000 |
|---|---|---|
| committer | Jacob Berkman <jberkman@src.gnome.org> | 2002-09-05 20:00:07 +0000 |
| commit | bcc5265f6cc00517264609bc7f2b1cb6c7a4181b (patch) | |
| tree | 877e7a4883f0671709e42efc61bcb5be653deec9 /autogen.sh | |
| parent | 41590bea09bc20fa96a655f01398df7ba402d1e0 (diff) | |
| download | gtk+-bcc5265f6cc00517264609bc7f2b1cb6c7a4181b.tar.gz | |
get automake-1.4 changes from -2-0 branch
2002-09-05 jacob berkman <jacob@ximian.com>
* autogen.sh: get automake-1.4 changes from -2-0 branch
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/autogen.sh b/autogen.sh index 3614e96fcc..bb3e10d58b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -38,8 +38,8 @@ fi } have_automake=false -if automake --version < /dev/null > /dev/null 2>&1 ; then - automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'` +if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then + automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'` case $automake_version in 1.2*|1.3*|1.4) ;; @@ -78,7 +78,7 @@ esac if test -z "$ACLOCAL_FLAGS"; then - acdir=`aclocal --print-ac-dir` + acdir=`aclocal-1.4 --print-ac-dir` m4list="glib-2.0.m4 glib-gettext.m4" for file in $m4list @@ -95,12 +95,12 @@ if test -z "$ACLOCAL_FLAGS"; then done fi -aclocal $ACLOCAL_FLAGS +aclocal-1.4 $ACLOCAL_FLAGS # optionally feature autoheader (autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader -automake -a $am_opt +automake-1.4 -a $am_opt autoconf cd $ORIGDIR |