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

@@ -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"
 

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)'

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)