Author: mikej Date: Fri Apr 3 15:38:47 2009 New Revision: 12912 Log: revert r12899 Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/build/modmake.rules.in Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Fri Apr 3 15:38:47 2009 @@ -87,7 +87,7 @@ # output is multiline from 1.5 onwards # Require libtool 1.4 or newer -libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14`} +libtool=`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14` lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then echo "bootstrap: libtool not found." @@ -103,11 +103,8 @@ if test -z "$1"; then a=0 ; else a=$1;fi if test -z "$2"; then b=0 ; else b=$2;fi if test -z "$3"; then c=0 ; else c=$3;fi -lt_major=$a -if test "$a" -eq "2"; then - lt_status="good" -elif test "$a" -lt "2"; then +if test "$a" -lt "2"; then if test "$b" -lt "5" -o "$b" = "5" -a "$c" -lt "14" ; then lt_status="bad" fi @@ -124,43 +121,6 @@ exit 1 fi -# check libtoolize availability -if [ -n "${LIBTOOL}" ]; then - libtoolize=${LIBTOOLIZE:-`dirname "${libtool}"`/libtoolize} -else - libtoolize=${LIBTOOLIZE:-`${LIBDIR}/apr/build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`} -fi -if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -fi -if [ ! -x "$libtoolize" ]; then - echo "$libtoolize does not exist or ist not executable" - exit 1 -fi - -# compare libtool and libtoolize version -ltl_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -ltl_version=`echo $ltl_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -IFS=.; set $ltl_version; IFS=' ' - -if [ "x${lt_version}" != "x${ltl_version}" ]; then - echo "$libtool and $libtoolize have different versions" - exit 1 -fi - - -# -# Info output -# -echo "Bootstrapping using:" -echo " autoconf : ${AUTOCONF:-`which autoconf`}" -echo " automake : ${AUTOMAKE:-`which automake`}" -echo " aclocal : ${ACLOCAL:-`which aclocal`}" -echo " libtool : ${libtool} (${lt_version})" -echo " libtoolize: ${libtoolize}" -echo - echo "Entering directory ${LIBDIR}/apr" cd ${LIBDIR}/apr @@ -184,6 +144,13 @@ # bootstrap: Build the support scripts needed to compile from a # checked-out version of the source code. + +libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize` +if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +fi + # Create the libtool helper files # # Note: we copy (rather than link) them to simplify distribution. @@ -196,30 +163,21 @@ # and libtool 1.4 by simply rerunning the bootstrap script. (cd build ; rm -f ltconfig ltmain.sh libtool.m4) -if ${libtoolize} -n --install 2>&1 >/dev/null ; then - $libtoolize --force --copy --install -else - $libtoolize --force --copy -fi +$libtoolize --copy --automake if [ -f libtool.m4 ]; then ltfile=`pwd`/libtool.m4 else - if [ $lt_major -eq 2 ]; then - ltfindcmd="`sed -n \"/aclocaldir=/{s/.*=/echo /p;q;}\" < $libtoolize`" - ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`/libtool.m4} - else - ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ - < $libtoolize`" - ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} - fi + ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ + < $libtoolize`" + ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} # Expecting the code above to be very portable, but just in case... if [ -z "$ltfile" -o ! -f "$ltfile" ]; then ltpath=`dirname $libtoolize` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 fi fi - + if [ ! -f $ltfile ]; then echo "$ltfile not found" exit 1 @@ -238,6 +196,19 @@ # Clean up any leftovers rm -f aclocal.m4 libtool.m4 +# +# Generate the autoconf header and ./configure +# +echo "Creating include/arch/unix/apr_private.h.in ..." +${AUTOHEADER:-autoheader} + +echo "Creating configure ..." +### do some work to toss config.cache? +${AUTOCONF:-autoconf} + +# Remove autoconf 2.5x's cache directory +rm -rf autom4te*.cache + # fix for FreeBSD (at least): # libtool.m4 is in share/aclocal, while e.g. aclocal19 only looks in share/aclocal19 # get aclocal's default directory and include the libtool.m4 directory via -I if @@ -249,24 +220,6 @@ ACLOCAL_OPTS="-I `dirname ${ltfile}`" fi -### run aclocal -echo "Re-creating aclocal.m4 ..." -${ACLOCAL:-aclocal} ${ACLOCAL_OPTS} - -### do some work to toss config.cache? -echo "Creating configure ..." -${AUTOCONF:-autoconf} - -# -# Generate the autoconf header -# -echo "Creating include/arch/unix/apr_private.h.in ..." -${AUTOHEADER:-autoheader} - - -# Remove autoconf 2.5x's cache directory -rm -rf autom4te*.cache - echo "Entering directory ${LIBDIR}/apr-util" cd ${LIBDIR}/apr-util ./buildconf @@ -298,11 +251,7 @@ #only run if AC_PROG_LIBTOOL is in configure.in/configure.ac if [ ! -z "${LTTEST}" -o "${LTTEST2}" ] ; then echo "Running libtoolize..." - if ${libtoolize} -n --install 2>&1 >/dev/null ; then - $libtoolize --force --copy --install - else - $libtoolize --force --copy - fi + $libtoolize --force --copy ; fi echo "Creating configure" Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Fri Apr 3 15:38:47 2009 @@ -10,7 +10,7 @@ INSTALL=@INSTALL@ GETLIB=@GETLIB@ LIBTOOL=@LIBTOOL@ -LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL) +LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL) LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f CCLD = $(CC) CXXLD = $(CXX) @@ -29,8 +29,7 @@ DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH OSARCH=`uname -s` -DYNAMIC_LIB_EXTEN = la -#DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ +DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ SOLINK = @SOLINK@ LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) @@ -40,11 +39,11 @@ COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) -LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE) -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ +CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ CSOURCEFILE=$(MODNAME).c CXXSOURCEFILE=$(MODNAME).cpp @@ -108,14 +107,14 @@ exit 1 ;\ fi -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).lo +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).o @echo Creating $@... @test -d .libs || mkdir .libs @error="";\ if test -f $(CSOURCEFILE); then \ - $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(LINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ else \ - $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(CXXLINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ fi; mod_clean: