From 2c4de1fb2133ea5760ef134f7813205cd1cbe79a Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Mon, 29 Dec 2008 02:37:16 +0000 Subject: [PATCH] set gettextize to $GETTEXTIZE and intltoolize to $INLTOOLIZE which is required for OSX as they're being used in non-standard locations. Originally committed to SVN as r2542. --- autogen.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/autogen.sh b/autogen.sh index fb278559c..6854d554e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,10 +10,13 @@ # directly. ACLOCAL=${ACLOCAL-aclocal-1.9} -AUTOCONF=${AUTOCONF-autoconf} +LIBTOOLIZE=${LIBTOOLIZE-libtoolize} AUTOHEADER=${AUTOHEADER-autoheader} AUTOMAKE=${AUTOMAKE-automake-1.9} -LIBTOOLIZE=${LIBTOOLIZE-libtoolize} +AUTOCONF=${AUTOCONF-autoconf} +GETTEXTIZE=${GETTEXTIZE-glib-gettextize} +INTLTOOLIZE=${INTLTOOLIZE-intltoolize} + GLIB_REQUIRED_VERSION=2.10.0 AUTOCONF_REQUIRED_VERSION=2.54 @@ -141,9 +144,9 @@ if test x$AUTOMAKE != x; then fi -echo -n "checking for glib-gettextize ... " -if (glib-gettextize --version) < /dev/null > /dev/null 2>&1; then - VER=`glib-gettextize --version \ +echo -n "checking for $GETTEXTIZE ... " +if ($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1; then + VER=`$GETTEXTIZE --version \ | grep glib-gettextize | sed "s/.* \([0-9.]*\)/\1/"` check_version $VER $GLIB_REQUIRED_VERSION else @@ -156,9 +159,9 @@ else fi -echo -n "checking for intltool >= $INTLTOOL_REQUIRED_VERSION ... " +echo -n "checking for $INTLTOOLIZE >= $INTLTOOL_REQUIRED_VERSION ... " if (intltoolize --version) < /dev/null > /dev/null 2>&1; then - VER=`intltoolize --version \ + VER=`$INTLTOOLIZE --version \ | grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"` check_version $VER $INTLTOOL_REQUIRED_VERSION else @@ -310,11 +313,11 @@ $AUTOMAKE --add-missing || exit $? echo "--- $AUTOCONF ---" $AUTOCONF || exit $? -echo "--- glib-gettextize ---" -glib-gettextize --force || exit $? +echo "--- $GETTEXTIZE ---" +$GETTEXTIZE --force || exit $? -echo "--- intltoolize ---" -intltoolize --force --automake || exit $? +echo "--- $INTTOOLIZE ---" +$INTLTOOLIZE --force --automake || exit $? cd $ORIGDIR