kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Michael Jerris 2009-02-06 19:15:42 +00:00
parent cb9cf4a3b8
commit bc1c18cfc2
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/apr-util/xml/expat/buildconf.sh
View File

@ -58,6 +58,8 @@ echo "Creating config.h.in ..."
${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" ${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
echo "Creating configure ..." echo "Creating configure ..."
${ACLOCAL:-aclocal}
### do some work to toss config.cache? ### do some work to toss config.cache?
${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"

4
libs/apr/configure.in
View File

@ -200,8 +200,8 @@ AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the
if test "x$use_libtool" = "xyes"; then if test "x$use_libtool" = "xyes"; then
lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" lt_version="-version-info `$get_version libtool $version_hdr APR`"
link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@" link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${lt_version} \$(ALL_LDFLAGS) -o \$@"
so_ext='lo' so_ext='lo'
lib_target='-rpath $(libdir) $(OBJECTS)' lib_target='-rpath $(libdir) $(OBJECTS)'
export_lib_target='-rpath \$(libdir) \$(OBJECTS)' export_lib_target='-rpath \$(libdir) \$(OBJECTS)'

1
libs/libsndfile/configure.ac
View File

@ -32,6 +32,7 @@ SHARED_VERSION_INFO="1:17:0"
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_CXX
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AC_CHECK_PROG(autogen, autogen, yes, no) AC_CHECK_PROG(autogen, autogen, yes, no)

6
src/mod/formats/mod_shout/Makefile
View File

@ -30,7 +30,7 @@ $(MPG123_DIR):
$(GETLIB) $(MPG123).tar.gz $(GETLIB) $(MPG123).tar.gz
$(MPG123_DIR)/Makefile: $(MPG123_DIR) $(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) $(TOUCH_TARGET)
$(MPG123LA): $(MPG123_DIR)/Makefile $(MPG123LA): $(MPG123_DIR)/Makefile
@ -41,7 +41,7 @@ $(LAME_DIR):
$(GETLIB) $(LAME).tar.gz $(GETLIB) $(LAME).tar.gz
$(LAME_DIR)/Makefile: $(LAME_DIR) $(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) $(TOUCH_TARGET)
$(LAMELA): $(LAME_DIR)/Makefile $(LAMELA): $(LAME_DIR)/Makefile
@ -52,7 +52,7 @@ $(SHOUT_DIR):
$(GETLIB) $(SHOUT).tar.gz $(GETLIB) $(SHOUT).tar.gz
$(SHOUT_DIR)/Makefile: $(SHOUT_DIR) $(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) $(TOUCH_TARGET)
$(SHOUTLA): $(SHOUT_DIR)/Makefile $(SHOUTLA): $(SHOUT_DIR)/Makefile