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
This commit is contained in:

committed by
Jacob Berkman

parent
41590bea09
commit
bcc5265f6c
@ -1,3 +1,7 @@
|
|||||||
|
2002-09-05 jacob berkman <jacob@ximian.com>
|
||||||
|
|
||||||
|
* autogen.sh: get automake-1.4 changes from -2-0 branch
|
||||||
|
|
||||||
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-09-05 jacob berkman <jacob@ximian.com>
|
||||||
|
|
||||||
|
* autogen.sh: get automake-1.4 changes from -2-0 branch
|
||||||
|
|
||||||
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-09-05 jacob berkman <jacob@ximian.com>
|
||||||
|
|
||||||
|
* autogen.sh: get automake-1.4 changes from -2-0 branch
|
||||||
|
|
||||||
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-09-05 jacob berkman <jacob@ximian.com>
|
||||||
|
|
||||||
|
* autogen.sh: get automake-1.4 changes from -2-0 branch
|
||||||
|
|
||||||
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-09-05 jacob berkman <jacob@ximian.com>
|
||||||
|
|
||||||
|
* autogen.sh: get automake-1.4 changes from -2-0 branch
|
||||||
|
|
||||||
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-09-05 jacob berkman <jacob@ximian.com>
|
||||||
|
|
||||||
|
* autogen.sh: get automake-1.4 changes from -2-0 branch
|
||||||
|
|
||||||
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
2002-09-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
|
||||||
|
10
autogen.sh
10
autogen.sh
@ -38,8 +38,8 @@ fi
|
|||||||
}
|
}
|
||||||
|
|
||||||
have_automake=false
|
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/'`
|
automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
|
||||||
case $automake_version in
|
case $automake_version in
|
||||||
1.2*|1.3*|1.4)
|
1.2*|1.3*|1.4)
|
||||||
;;
|
;;
|
||||||
@ -78,7 +78,7 @@ esac
|
|||||||
|
|
||||||
if test -z "$ACLOCAL_FLAGS"; then
|
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"
|
m4list="glib-2.0.m4 glib-gettext.m4"
|
||||||
|
|
||||||
for file in $m4list
|
for file in $m4list
|
||||||
@ -95,12 +95,12 @@ if test -z "$ACLOCAL_FLAGS"; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
aclocal $ACLOCAL_FLAGS
|
aclocal-1.4 $ACLOCAL_FLAGS
|
||||||
|
|
||||||
# optionally feature autoheader
|
# optionally feature autoheader
|
||||||
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
|
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
|
||||||
|
|
||||||
automake -a $am_opt
|
automake-1.4 -a $am_opt
|
||||||
autoconf
|
autoconf
|
||||||
cd $ORIGDIR
|
cd $ORIGDIR
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user