diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2005-12-19 22:24:28 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2005-12-19 22:24:28 (GMT) |
| commit | 4208cfa0162f433ef17f289c6568f19648341fd9 (patch) | |
| tree | a0ab0491e4c90f5ec285a957b75247e4fddbbeec /gnome2-macros | |
| parent | a8b3a8f9d2b01ce8e17747a145048fb0247a48ad (diff) | |
- Patch by Patrick GOLDBRONN pgoldbronn on free.fr
Support out of dir compilation
Diffstat (limited to 'gnome2-macros')
| -rw-r--r-- | gnome2-macros/autogen.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnome2-macros/autogen.sh b/gnome2-macros/autogen.sh index f1a0437..4d7dfd3 100644 --- a/gnome2-macros/autogen.sh +++ b/gnome2-macros/autogen.sh @@ -234,9 +234,11 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` case $REQUIRED_AUTOMAKE_VERSION in 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.7" ;; + 1.5*) automake_progs="automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; + 1.6*) automake_progs="automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; + 1.7*) automake_progs="automake-1.9 automake-1.8 automake-1.7" ;; + 1.8*) automake_progs="automake-1.9 automake-1.8" ;; + 1.9*) automake_progs="automake-1.9" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1 @@ -302,6 +304,7 @@ for configure_ac in $configure_files; do aclocalinclude="$ACLOCAL_FLAGS" printbold "Running $ACLOCAL..." + cd $dirname $ACLOCAL $aclocalinclude || exit 1 if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then |