[at-spi2-atk] Update autogen.sh, in order to support automake 1.12
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-atk] Update autogen.sh, in order to support automake 1.12
- Date: Tue, 1 May 2012 13:49:02 +0000 (UTC)
commit 5c84ffb69893d04b51acd98d0c91528d87d4738a
Author: Mike Gorse <mgorse suse com>
Date: Tue May 1 08:52:45 2012 -0500
Update autogen.sh, in order to support automake 1.12
autogen.sh | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
old mode 100755
new mode 100644
index 940b7a8..3179c3f
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,8 +36,13 @@ case `echo -n x` in
esac
# some terminal codes ...
-boldface="`tput bold 2>/dev/null`"
-normal="`tput sgr0 2>/dev/null`"
+if tty < /dev/null 1>/dev/null 2>&1; then
+ boldface="`tput bold 2>/dev/null`"
+ normal="`tput sgr0 2>/dev/null`"
+else
+ boldface=
+ normal=
+fi
printbold() {
echo $ECHO_N "$boldface" $ECHO_C
echo "$@"
@@ -295,6 +300,10 @@ for configure_ac in $configure_files; do
want_maintainer_mode=true
fi
+ if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then
+ require_m4macro yelp.m4
+ fi
+
# check to make sure gnome-common macros can be found ...
if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null ||
grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null ||
@@ -316,13 +325,14 @@ 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.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
- 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
- 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
- 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
- 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
- 1.10*) automake_progs="automake-1.11 automake-1.10" ;;
- 1.11*) automake_progs="automake-1.11" ;;
+ 1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+ 1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+ 1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+ 1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+ 1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
+ 1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
+ 1.11*) automake_progs="automake-1.12 automake-1.11" ;;
+ 1.12*) automake_progs="automake-1.12" ;;
esac
version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
"http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]