mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

mkinstalldirs is no longer required for gettext.

Browse source 
Originally committed to SVN as r2657.
This commit is contained in:
Amar Takhar 2009-01-06 09:38:17 +00:00
parent d9f9206b40
commit 8d25a378c3
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -36,13 +36,11 @@ EXTRA_DIST = \
intltool-extract.in \ intltool-extract.in \
intltool-merge.in \ intltool-merge.in \
intltool-update.in \ intltool-update.in \
mkinstalldirs \
config.guess \ config.guess \
config.sub \ config.sub \
depcomp \ depcomp \
install-sh \ install-sh \
missing \ missing \
mkinstalldirs \
INSTALL \ INSTALL \
README README

32
autogen.sh
View file

@ -14,7 +14,7 @@ LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
AUTOHEADER=${AUTOHEADER-autoheader} AUTOHEADER=${AUTOHEADER-autoheader}
AUTOMAKE=${AUTOMAKE-automake-1.9} AUTOMAKE=${AUTOMAKE-automake-1.9}
AUTOCONF=${AUTOCONF-autoconf} AUTOCONF=${AUTOCONF-autoconf}
GETTEXTIZE=${GETTEXTIZE-glib-gettextize} #GETTEXTIZE=${GETTEXTIZE-glib-gettextize}
INTLTOOLIZE=${INTLTOOLIZE-intltoolize} INTLTOOLIZE=${INTLTOOLIZE-intltoolize}
@ -153,19 +153,19 @@ if test x$AUTOMAKE != x; then
fi fi
$ECHO_N "checking for $GETTEXTIZE ... " #$ECHO_N "checking for $GETTEXTIZE ... "
if ($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1; then #if ($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1; then
VER=`$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
echo # echo
echo " You must have glib-gettextize installed to compile $PROJECT." # echo " You must have glib-gettextize installed to compile $PROJECT."
echo " glib-gettextize is part of glib-2.0, so you should already" # echo " glib-gettextize is part of glib-2.0, so you should already"
echo " have it. Make sure it is in your PATH." # echo " have it. Make sure it is in your PATH."
echo # echo
DIE=1 # DIE=1
fi #fi
$ECHO_N "checking for $INTLTOOLIZE >= $INTLTOOL_REQUIRED_VERSION ... " $ECHO_N "checking for $INTLTOOLIZE >= $INTLTOOL_REQUIRED_VERSION ... "
@ -318,8 +318,8 @@ $AUTOMAKE --add-missing || exit $?
echo "--- $AUTOCONF ---" echo "--- $AUTOCONF ---"
$AUTOCONF || exit $? $AUTOCONF || exit $?
echo "--- $GETTEXTIZE ---" #echo "--- $GETTEXTIZE ---"
$GETTEXTIZE --force || exit $? #$GETTEXTIZE --force || exit $?
echo "--- $INTTOOLIZE ---" echo "--- $INTTOOLIZE ---"
$INTLTOOLIZE --force --automake || exit $? $INTLTOOLIZE --force --automake || exit $?