diff options
| author | jacob berkman <jacob@ximian.com> | 2002-09-05 19:54:45 +0000 |
|---|---|---|
| committer | Jacob Berkman <jberkman@src.gnome.org> | 2002-09-05 19:54:45 +0000 |
| commit | 44ae86895367c5d3c3fc04847fc22adde97ab297 (patch) | |
| tree | d4b95e8b878fcfb68d0c640e5bb7f9160f1886ba | |
| parent | 3767fe8946460aa77e559b24265a5367e8049083 (diff) | |
| download | pango-44ae86895367c5d3c3fc04847fc22adde97ab297.tar.gz | |
copy version with automake-1.4 fixes from -1-0 branch
2002-09-05 jacob berkman <jacob@ximian.com>
* autogen.sh: copy version with automake-1.4 fixes from -1-0 branch
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 4 | ||||
| -rwxr-xr-x | autogen.sh | 8 |
7 files changed, 28 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2002-09-05 jacob berkman <jacob@ximian.com> + + * autogen.sh: copy version with automake-1.4 fixes from -1-0 branch + 2002-09-05 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_render): Render only valid diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c24a8385..003252ec 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,7 @@ +2002-09-05 jacob berkman <jacob@ximian.com> + + * autogen.sh: copy version with automake-1.4 fixes from -1-0 branch + 2002-09-05 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_render): Render only valid diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index c24a8385..003252ec 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,7 @@ +2002-09-05 jacob berkman <jacob@ximian.com> + + * autogen.sh: copy version with automake-1.4 fixes from -1-0 branch + 2002-09-05 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_render): Render only valid diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index c24a8385..003252ec 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,7 @@ +2002-09-05 jacob berkman <jacob@ximian.com> + + * autogen.sh: copy version with automake-1.4 fixes from -1-0 branch + 2002-09-05 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_render): Render only valid diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index c24a8385..003252ec 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,7 @@ +2002-09-05 jacob berkman <jacob@ximian.com> + + * autogen.sh: copy version with automake-1.4 fixes from -1-0 branch + 2002-09-05 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_render): Render only valid diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c24a8385..003252ec 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,7 @@ +2002-09-05 jacob berkman <jacob@ximian.com> + + * autogen.sh: copy version with automake-1.4 fixes from -1-0 branch + 2002-09-05 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_render): Render only valid @@ -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) ;; @@ -72,12 +72,12 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then fi fi -aclocal $ACLOCAL_FLAGS +aclocal-1.4 $ACLOCAL_FLAGS # optionally run autoheader (autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader -automake -a $am_opt +automake-1.4 -a $am_opt autoconf cd $ORIGDIR |