mkinstalldirs is no longer required for gettext.
Originally committed to SVN as r2657.
This commit is contained in:
parent
d9f9206b40
commit
8d25a378c3
2 changed files with 16 additions and 18 deletions
|
@ -36,13 +36,11 @@ EXTRA_DIST = \
|
|||
intltool-extract.in \
|
||||
intltool-merge.in \
|
||||
intltool-update.in \
|
||||
mkinstalldirs \
|
||||
config.guess \
|
||||
config.sub \
|
||||
depcomp \
|
||||
install-sh \
|
||||
missing \
|
||||
mkinstalldirs \
|
||||
INSTALL \
|
||||
README
|
||||
|
||||
|
|
32
autogen.sh
32
autogen.sh
|
@ -14,7 +14,7 @@ LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
|
|||
AUTOHEADER=${AUTOHEADER-autoheader}
|
||||
AUTOMAKE=${AUTOMAKE-automake-1.9}
|
||||
AUTOCONF=${AUTOCONF-autoconf}
|
||||
GETTEXTIZE=${GETTEXTIZE-glib-gettextize}
|
||||
#GETTEXTIZE=${GETTEXTIZE-glib-gettextize}
|
||||
INTLTOOLIZE=${INTLTOOLIZE-intltoolize}
|
||||
|
||||
|
||||
|
@ -153,19 +153,19 @@ if test x$AUTOMAKE != x; then
|
|||
fi
|
||||
|
||||
|
||||
$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
|
||||
echo
|
||||
echo " You must have glib-gettextize installed to compile $PROJECT."
|
||||
echo " glib-gettextize is part of glib-2.0, so you should already"
|
||||
echo " have it. Make sure it is in your PATH."
|
||||
echo
|
||||
DIE=1
|
||||
fi
|
||||
#$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
|
||||
# echo
|
||||
# echo " You must have glib-gettextize installed to compile $PROJECT."
|
||||
# echo " glib-gettextize is part of glib-2.0, so you should already"
|
||||
# echo " have it. Make sure it is in your PATH."
|
||||
# echo
|
||||
# DIE=1
|
||||
#fi
|
||||
|
||||
|
||||
$ECHO_N "checking for $INTLTOOLIZE >= $INTLTOOL_REQUIRED_VERSION ... "
|
||||
|
@ -318,8 +318,8 @@ $AUTOMAKE --add-missing || exit $?
|
|||
echo "--- $AUTOCONF ---"
|
||||
$AUTOCONF || exit $?
|
||||
|
||||
echo "--- $GETTEXTIZE ---"
|
||||
$GETTEXTIZE --force || exit $?
|
||||
#echo "--- $GETTEXTIZE ---"
|
||||
#$GETTEXTIZE --force || exit $?
|
||||
|
||||
echo "--- $INTTOOLIZE ---"
|
||||
$INTLTOOLIZE --force --automake || exit $?
|
||||
|
|
Loading…
Reference in a new issue