From 72e945d91ac893fdb0503937a67676cb839d9772 Mon Sep 17 00:00:00 2001 From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com> Date: Sun, 15 Jun 2008 01:12:24 -0500 Subject: [PATCH] Do not bother calling glibtoolize; call libtoolize only if libtool is used; call glib-gettextize and intltoolize only if po/ is present --- autogen.sh | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/autogen.sh b/autogen.sh index e4c7e637..befd197e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -20,28 +20,21 @@ echo "Generating configuration files..." ACLOCAL=${ACLOCAL:-aclocal-1.10} ACLOCAL_FLAGS="$aclocal_extra $ACLOCAL_FLAGS" AUTOMAKE=${AUTOMAKE:-automake-1.10} - -if test -z "$LIBTOOLIZE"; then - case "`uname`" in - Darwin) - LIBTOOLIZE=glibtoolize - ;; - *) - LIBTOOLIZE=libtoolize - ;; - esac -fi - AUTOHEADER=${AUTOHEADER:-autoheader} AUTOCONF=${AUTOCONF:-autoconf} +LIBTOOLIZE=${LIBTOOLIZE:-libtoolize} -echo $LIBTOOLIZE --automake --copy --force -$LIBTOOLIZE --automake --copy --force || exit $? +if grep AC_PROG_LIBTOOL configure.ac; then + echo $LIBTOOLIZE --automake --copy --force + $LIBTOOLIZE --automake --copy --force || exit $? +fi -echo glib-gettextize --force --copy -glib-gettextize --force --copy || exit $? -echo intltoolize --automake --force --copy -intltoolize --automake --force --copy || exit $? +if [ -d po ]; then + echo glib-gettextize --force --copy + glib-gettextize --force --copy || exit $? + echo intltoolize --automake --force --copy + intltoolize --automake --force --copy || exit $? +fi if [ -d po-gsv ] ; then echo sed 's/@GETTEXT_PACKAGE@/@GETTEXT_PACKAGE@-gsv/' po/Makefile.in.in '>' po-gsv/Makefile.in.in