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.
This commit is contained in:
parent
b4175fbd75
commit
2c4de1fb21
1 changed files with 14 additions and 11 deletions
25
autogen.sh
25
autogen.sh
|
@ -10,10 +10,13 @@
|
||||||
# directly.
|
# directly.
|
||||||
|
|
||||||
ACLOCAL=${ACLOCAL-aclocal-1.9}
|
ACLOCAL=${ACLOCAL-aclocal-1.9}
|
||||||
AUTOCONF=${AUTOCONF-autoconf}
|
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
|
||||||
AUTOHEADER=${AUTOHEADER-autoheader}
|
AUTOHEADER=${AUTOHEADER-autoheader}
|
||||||
AUTOMAKE=${AUTOMAKE-automake-1.9}
|
AUTOMAKE=${AUTOMAKE-automake-1.9}
|
||||||
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
|
AUTOCONF=${AUTOCONF-autoconf}
|
||||||
|
GETTEXTIZE=${GETTEXTIZE-glib-gettextize}
|
||||||
|
INTLTOOLIZE=${INTLTOOLIZE-intltoolize}
|
||||||
|
|
||||||
|
|
||||||
GLIB_REQUIRED_VERSION=2.10.0
|
GLIB_REQUIRED_VERSION=2.10.0
|
||||||
AUTOCONF_REQUIRED_VERSION=2.54
|
AUTOCONF_REQUIRED_VERSION=2.54
|
||||||
|
@ -141,9 +144,9 @@ if test x$AUTOMAKE != x; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo -n "checking for glib-gettextize ... "
|
echo -n "checking for $GETTEXTIZE ... "
|
||||||
if (glib-gettextize --version) < /dev/null > /dev/null 2>&1; then
|
if ($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1; then
|
||||||
VER=`glib-gettextize --version \
|
VER=`$GETTEXTIZE --version \
|
||||||
| grep glib-gettextize | sed "s/.* \([0-9.]*\)/\1/"`
|
| grep glib-gettextize | sed "s/.* \([0-9.]*\)/\1/"`
|
||||||
check_version $VER $GLIB_REQUIRED_VERSION
|
check_version $VER $GLIB_REQUIRED_VERSION
|
||||||
else
|
else
|
||||||
|
@ -156,9 +159,9 @@ else
|
||||||
fi
|
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
|
if (intltoolize --version) < /dev/null > /dev/null 2>&1; then
|
||||||
VER=`intltoolize --version \
|
VER=`$INTLTOOLIZE --version \
|
||||||
| grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
|
| grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
|
||||||
check_version $VER $INTLTOOL_REQUIRED_VERSION
|
check_version $VER $INTLTOOL_REQUIRED_VERSION
|
||||||
else
|
else
|
||||||
|
@ -310,11 +313,11 @@ $AUTOMAKE --add-missing || exit $?
|
||||||
echo "--- $AUTOCONF ---"
|
echo "--- $AUTOCONF ---"
|
||||||
$AUTOCONF || exit $?
|
$AUTOCONF || exit $?
|
||||||
|
|
||||||
echo "--- glib-gettextize ---"
|
echo "--- $GETTEXTIZE ---"
|
||||||
glib-gettextize --force || exit $?
|
$GETTEXTIZE --force || exit $?
|
||||||
|
|
||||||
echo "--- intltoolize ---"
|
echo "--- $INTTOOLIZE ---"
|
||||||
intltoolize --force --automake || exit $?
|
$INTLTOOLIZE --force --automake || exit $?
|
||||||
|
|
||||||
cd $ORIGDIR
|
cd $ORIGDIR
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue