diff options
| author | infirit <[email protected]> | 2014-01-03 15:32:14 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-01-03 15:32:14 +0100 |
| commit | a1bbc3ba85d9f62c759ff9168fce150868c29dc9 (patch) | |
| tree | 2017ef0d5bac3991f0955dfdccb64979fc2a680b | |
| parent | 2c0c0cc3954d08542d41a796926a29307076a154 (diff) | |
| download | mate-common-a1bbc3ba85d9f62c759ff9168fce150868c29dc9.tar.bz2 mate-common-a1bbc3ba85d9f62c759ff9168fce150868c29dc9.tar.xz | |
Better support of using AUTOCONF environment variable
Gnome bug url:
http://bugzilla.gnome.org/show_bug.cgi?id=510713
Based on GNOME commit:
https://git.gnome.org/browse/gnome-common/commit/?id=4bb2a2450f67550ae761c75cb7ff2325bad54c8b
| -rw-r--r-- | macros/mate-autogen | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/macros/mate-autogen b/macros/mate-autogen index f2c0910..caf390f 100644 --- a/macros/mate-autogen +++ b/macros/mate-autogen @@ -280,6 +280,13 @@ want_gtk_doc=false want_yelp_tools=false want_maintainer_mode=false +#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 +WANT_AUTOCONF_2_5=1 +export WANT_AUTOCONF_2_5 +version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ + "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" +AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` + find_configure_files() { configure_ac= if test -f "$1/configure.ac"; then @@ -289,8 +296,7 @@ find_configure_files() { fi if test "x$configure_ac" != x; then echo "$configure_ac" - # TODO We have not detected the right autoconf yet! - autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do + $AUTOCONF -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do find_configure_files "$1/$dir" done fi @@ -348,13 +354,6 @@ for configure_ac in $configure_files; do fi done -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" -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.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; |