# HG changeset patch # User Stu Tomlinson # Date 1209066660 0 # Node ID d146e87ba40d95b130d314387c65b6eff17411eb # Parent 10ab0aed3e804f7fee307a2c479d4542dc67a117 echo -n is not portable, and OSX has libtoolize installed as glibtoolize diff -r 10ab0aed3e80 -r d146e87ba40d autogen.sh --- a/autogen.sh Thu Apr 24 11:32:13 2008 +0000 +++ b/autogen.sh Thu Apr 24 19:51:00 2008 +0000 @@ -49,13 +49,21 @@ PACKAGE="Pidgin" ARGS_FILE="autogen.args" +libtoolize="libtoolize" +case $(uname -s) in + Darwin*) + libtoolize="glibtoolize" + ;; + *) +esac + ############################################################################### # Some helper functions ############################################################################### check () { CMD=$1 - echo -n "checking for ${CMD}... " + printf "%s" "checking for ${CMD}... " BIN=`which ${CMD} 2> /dev/null` if [ x"${BIN}" = x"" ] ; then @@ -71,7 +79,7 @@ CMD=$1 shift - echo -n "running ${CMD} ${@}... " + printf "%s" "running ${CMD} ${@}... " OUTPUT=`${CMD} ${@} 2>&1` if [ $? != 0 ] ; then echo "failed." @@ -99,10 +107,10 @@ ############################################################################### # Look for our args file ############################################################################### -echo -n "checking for ${ARGS_FILE}: " +printf "%s" "checking for ${ARGS_FILE}: " if [ -f ${ARGS_FILE} ] ; then echo "found." - echo -n "sourcing ${ARGS_FILE}: " + printf "%s" "sourcing ${ARGS_FILE}: " . autogen.args echo "done." else @@ -112,7 +120,7 @@ ############################################################################### # Check for our required helpers ############################################################################### -check "libtoolize"; LIBTOOLIZE=${BIN}; +check "$libtoolize"; LIBTOOLIZE=${BIN}; check "glib-gettextize"; GLIB_GETTEXTIZE=${BIN}; check "intltoolize"; INTLTOOLIZE=${BIN}; check "aclocal"; ACLOCAL=${BIN};