From bc1c18cfc205cc765b05cea177f84ca8cc70333f Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 6 Feb 2009 19:15:42 +0000 Subject: [PATCH] merge parts of libtool 2.2 fixes (FSBUILD-82) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11671 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/apr-util/xml/expat/buildconf.sh | 2 ++ libs/apr/configure.in | 4 ++-- libs/libsndfile/configure.ac | 1 + src/mod/formats/mod_shout/Makefile | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libs/apr-util/xml/expat/buildconf.sh b/libs/apr-util/xml/expat/buildconf.sh index d36a292e8e..1f5789dc07 100755 --- a/libs/apr-util/xml/expat/buildconf.sh +++ b/libs/apr-util/xml/expat/buildconf.sh @@ -58,6 +58,8 @@ echo "Creating config.h.in ..." ${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" echo "Creating configure ..." +${ACLOCAL:-aclocal} + ### do some work to toss config.cache? ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" diff --git a/libs/apr/configure.in b/libs/apr/configure.in index 8c0135ab7b..59fa7b9c7c 100644 --- a/libs/apr/configure.in +++ b/libs/apr/configure.in @@ -200,8 +200,8 @@ AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the if test "x$use_libtool" = "xyes"; then lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' - LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" - link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@" + lt_version="-version-info `$get_version libtool $version_hdr APR`" + link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${lt_version} \$(ALL_LDFLAGS) -o \$@" so_ext='lo' lib_target='-rpath $(libdir) $(OBJECTS)' export_lib_target='-rpath \$(libdir) \$(OBJECTS)' diff --git a/libs/libsndfile/configure.ac b/libs/libsndfile/configure.ac index 2f08a96d05..3614b8ba3f 100644 --- a/libs/libsndfile/configure.ac +++ b/libs/libsndfile/configure.ac @@ -32,6 +32,7 @@ SHARED_VERSION_INFO="1:17:0" AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_CXX AM_PROG_LIBTOOL AC_CHECK_PROG(autogen, autogen, yes, no) diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile index 35b7f155dc..cf432def3b 100644 --- a/src/mod/formats/mod_shout/Makefile +++ b/src/mod/formats/mod_shout/Makefile @@ -30,7 +30,7 @@ $(MPG123_DIR): $(GETLIB) $(MPG123).tar.gz $(MPG123_DIR)/Makefile: $(MPG123_DIR) - cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS= + cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(MPG123LA): $(MPG123_DIR)/Makefile @@ -41,7 +41,7 @@ $(LAME_DIR): $(GETLIB) $(LAME).tar.gz $(LAME_DIR)/Makefile: $(LAME_DIR) - cd $(LAME_DIR) && ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS= + cd $(LAME_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(LAMELA): $(LAME_DIR)/Makefile @@ -52,7 +52,7 @@ $(SHOUT_DIR): $(GETLIB) $(SHOUT).tar.gz $(SHOUT_DIR)/Makefile: $(SHOUT_DIR) - cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= + cd $(SHOUT_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(SHOUTLA): $(SHOUT_DIR)/Makefile