pidgin: c1c52794: echo -n is not portable, and OSX has lib...

nosnilmot at pidgin.im nosnilmot at pidgin.im
Thu Apr 24 15:55:43 EDT 2008


-----------------------------------------------------------------
Revision: c1c52794e349dc32db9a48305c457dab1483c374
Ancestor: 4ec7a57bf40c64f7c0190fb2e769aedb95d39200
Author: nosnilmot at pidgin.im
Date: 2008-04-24T19:51:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c1c52794e349dc32db9a48305c457dab1483c374

Modified files:
        autogen.sh

ChangeLog: 

echo -n is not portable, and OSX has libtoolize installed as glibtoolize

-------------- next part --------------
============================================================
--- autogen.sh	0ba629e53763eceb83590b6bbd7790c6e97c6928
+++ autogen.sh	b73ffde262b73519f4597623486ee1bfc1544a4f
@@ -49,13 +49,21 @@ ARGS_FILE="autogen.args"
 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 @@ run_or_die () { # beotch
 	CMD=$1
 	shift
 
-	echo -n "running ${CMD} ${@}... "
+	printf "%s" "running ${CMD} ${@}... "
 	OUTPUT=`${CMD} ${@} 2>&1`
 	if [ $? != 0 ] ; then
 		echo "failed."
@@ -99,10 +107,10 @@ fi
 ###############################################################################
 # 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 @@ fi
 ###############################################################################
 # 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};


More information about the Commits mailing list