[Freeswitch-svn] [commit] r6480 - in freeswitch/trunk/libs: codec/g726 codec/g7xx codec/ilbc codec/lpc10 iax js js/nsprpub libdingaling libresample libteletone speex srtp
Freeswitch SVN
anthm at freeswitch.org
Mon Dec 3 11:29:07 EST 2007
Author: anthm
Date: Mon Dec 3 11:29:07 2007
New Revision: 6480
Modified:
freeswitch/trunk/libs/codec/g726/configure.in
freeswitch/trunk/libs/codec/g7xx/configure.in
freeswitch/trunk/libs/codec/ilbc/configure.in
freeswitch/trunk/libs/codec/lpc10/configure.ac
freeswitch/trunk/libs/iax/configure.in
freeswitch/trunk/libs/js/configure.ac
freeswitch/trunk/libs/js/nsprpub/configure.in
freeswitch/trunk/libs/libdingaling/configure.in
freeswitch/trunk/libs/libresample/configure.in
freeswitch/trunk/libs/libteletone/configure.in
freeswitch/trunk/libs/speex/acinclude.m4
freeswitch/trunk/libs/speex/speex.m4
freeswitch/trunk/libs/srtp/configure.in
Log:
don't link to installed libs, patch from stkn (fix for MODLANG-47)
Modified: freeswitch/trunk/libs/codec/g726/configure.in
==============================================================================
--- freeswitch/trunk/libs/codec/g726/configure.in (original)
+++ freeswitch/trunk/libs/codec/g726/configure.in Mon Dec 3 11:29:07 2007
@@ -44,7 +44,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-fPIC"
@@ -64,7 +64,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fPIC"
@@ -76,7 +76,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fpic"
@@ -84,6 +84,18 @@
fi
DYNAMIC_LIB_EXTEN="so"
;;
+ x86_64-*-freebsd*|amd64-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fPIC"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
+ i*6-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fpic"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
esac
# Enable 64 bit build
AC_ARG_ENABLE(64,
Modified: freeswitch/trunk/libs/codec/g7xx/configure.in
==============================================================================
--- freeswitch/trunk/libs/codec/g7xx/configure.in (original)
+++ freeswitch/trunk/libs/codec/g7xx/configure.in Mon Dec 3 11:29:07 2007
@@ -38,12 +38,14 @@
case "$host" in
*-solaris2*)
- if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G"
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
IN_LINE=""
- elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G"
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS=""
IN_LINE=inline
@@ -63,7 +65,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -77,7 +79,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -87,6 +89,20 @@
DYNAMIC_LIB_EXTEN="so"
IN_LINE=inline
;;
+ x86_64-*-freebsd*|amd64-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fPIC"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ IN_LINE=inline
+ ;;
+ i*6-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fpic"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ IN_LINE=inline
+ ;;
esac
# Enable 64 bit build
Modified: freeswitch/trunk/libs/codec/ilbc/configure.in
==============================================================================
--- freeswitch/trunk/libs/codec/ilbc/configure.in (original)
+++ freeswitch/trunk/libs/codec/ilbc/configure.in Mon Dec 3 11:29:07 2007
@@ -41,12 +41,14 @@
case "$host" in
*-solaris2*)
- if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G"
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
IN_LINE=""
- elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G"
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS=""
IN_LINE=inline
@@ -66,7 +68,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -80,7 +82,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -90,6 +92,20 @@
DYNAMIC_LIB_EXTEN="so"
IN_LINE=inline
;;
+ x86_64-*-freebsd*|amd64-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fPIC"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ IN_LINE=inline
+ ;;
+ i*6-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fpic"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ IN_LINE=inline
+ ;;
esac
# Enable 64 bit build
AC_ARG_ENABLE(64,
Modified: freeswitch/trunk/libs/codec/lpc10/configure.ac
==============================================================================
--- freeswitch/trunk/libs/codec/lpc10/configure.ac (original)
+++ freeswitch/trunk/libs/codec/lpc10/configure.ac Mon Dec 3 11:29:07 2007
@@ -40,10 +40,12 @@
case "$host" in
*-solaris2*)
- if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G"
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
- elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G"
+ new_AM_LDFLAGS="-R${prefix}/lib"
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS=""
IN_LINE=inline
@@ -62,7 +64,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fPIC"
@@ -74,7 +76,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fpic"
@@ -82,6 +84,18 @@
fi
DYNAMIC_LIB_EXTEN="so"
;;
+ x86_64-*-freebsd*|amd64-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fPIC"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
+ i*6-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fpic"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
esac
# Enable 64 bit build
AC_ARG_ENABLE(64,
Modified: freeswitch/trunk/libs/iax/configure.in
==============================================================================
--- freeswitch/trunk/libs/iax/configure.in (original)
+++ freeswitch/trunk/libs/iax/configure.in Mon Dec 3 11:29:07 2007
@@ -39,11 +39,13 @@
case "$host" in
*-solaris2*)
- if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G"
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
IN_LINE=""
- elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G"
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS=""
IN_LINE=inline
@@ -63,7 +65,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fPIC"
@@ -76,7 +78,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fpic"
@@ -89,7 +91,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fPIC"
Modified: freeswitch/trunk/libs/js/configure.ac
==============================================================================
--- freeswitch/trunk/libs/js/configure.ac (original)
+++ freeswitch/trunk/libs/js/configure.ac Mon Dec 3 11:29:07 2007
@@ -179,8 +179,10 @@
if test ".$ac_cv_with_nspr" = ".yes"; then
sinclude(nsprpub/config/nspr.m4)
CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr -Insprpub/pr/include"
- LDFLAGS="$LDFLAGS -L$prefix/lib -L./nsprpub/dist/lib -lnspr4"
+ LDFLAGS="$LDFLAGS -L./nsprpub/dist/lib"
+ LIBS="$LIBS -lnspr4"
LIBPATH="LD_LIBRARY_PATH=./nsprpub/dist/lib DYLD_LIBRARY_PATH=./nsprpub/dist/lib"
+ AC_CHECK_LIB(pthread, pthread_create, [CLI_LIBS="$CLI_LIBS -lpthread"])
fi
AC_DEFUN([AX_COMPILER_VENDOR],
Modified: freeswitch/trunk/libs/js/nsprpub/configure.in
==============================================================================
--- freeswitch/trunk/libs/js/nsprpub/configure.in (original)
+++ freeswitch/trunk/libs/js/nsprpub/configure.in Mon Dec 3 11:29:07 2007
@@ -1125,7 +1125,7 @@
AC_DEFINE(FREEBSD)
AC_DEFINE(HAVE_BSD_FLOCK)
AC_DEFINE(HAVE_SOCKLEN_T)
- CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+ CFLAGS="$CFLAGS -ansi -Wall"
MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
if test "$MOZ_OBJFORMAT" = "elf"; then
DLL_SUFFIX=so
@@ -1137,7 +1137,7 @@
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
MDCPUCFG_H=_freebsd.cfg
PR_MD_CSRCS=freebsd.c
- ;;
+ ;;
*-hpux*)
AC_DEFINE(XP_UNIX)
Modified: freeswitch/trunk/libs/libdingaling/configure.in
==============================================================================
--- freeswitch/trunk/libs/libdingaling/configure.in (original)
+++ freeswitch/trunk/libs/libdingaling/configure.in Mon Dec 3 11:29:07 2007
@@ -42,12 +42,14 @@
case "$host" in
*-solaris2*)
- if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G"
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
IN_LINE=""
- elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G"
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS=""
IN_LINE=inline
@@ -67,7 +69,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -81,7 +83,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -95,7 +97,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
Modified: freeswitch/trunk/libs/libresample/configure.in
==============================================================================
--- freeswitch/trunk/libs/libresample/configure.in (original)
+++ freeswitch/trunk/libs/libresample/configure.in Mon Dec 3 11:29:07 2007
@@ -47,12 +47,14 @@
case "$host" in
*-solaris2*)
- if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G"
+ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
IN_LINE=""
- elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G"
+ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+ SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS=""
IN_LINE=inline
@@ -71,7 +73,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -84,7 +86,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -93,6 +95,18 @@
fi
DYNAMIC_LIB_EXTEN="so"
;;
+ x86_64-*-freebsd*|amd64-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fPIC"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
+ i*6-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fpic"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
esac
# Enable 64 bit build
Modified: freeswitch/trunk/libs/libteletone/configure.in
==============================================================================
--- freeswitch/trunk/libs/libteletone/configure.in (original)
+++ freeswitch/trunk/libs/libteletone/configure.in Mon Dec 3 11:29:07 2007
@@ -39,7 +39,7 @@
*-solaris2*)
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
fi
;;
*-darwin*)
@@ -55,6 +55,14 @@
new_AM_CFLAGS="-fpic"
new_AM_LDFLAGS=""
;;
+ x86_64-*-freebsd*|amd64-*-freebsd*)
+ new_AM_CFLAGS="-fpic"
+ new_AM_LDFLAGS=""
+ ;;
+ i*6-*-freebsd*)
+ new_AM_CFLAGS="-fpic"
+ new_AM_LDFLAGS=""
+ ;;
esac
AC_SUBST(new_AM_CFLAGS)
AC_SUBST(new_AM_LDFLAGS)
Modified: freeswitch/trunk/libs/speex/acinclude.m4
==============================================================================
--- freeswitch/trunk/libs/speex/acinclude.m4 (original)
+++ freeswitch/trunk/libs/speex/acinclude.m4 Mon Dec 3 11:29:07 2007
@@ -19,7 +19,7 @@
elif test "x$ogg_prefix" != "x" ; then
OGG_LIBS="-L$ogg_prefix/lib"
elif test "x$prefix" != "xNONE" ; then
- OGG_LIBS="-L$prefix/lib"
+ OGG_LIBS=""
fi
OGG_LIBS="$OGG_LIBS -logg"
Modified: freeswitch/trunk/libs/speex/speex.m4
==============================================================================
--- freeswitch/trunk/libs/speex/speex.m4 (original)
+++ freeswitch/trunk/libs/speex/speex.m4 Mon Dec 3 11:29:07 2007
@@ -21,7 +21,7 @@
elif test "x$speex_prefix" != "x" ; then
SPEEX_LIBS="-L$speex_prefix/lib"
elif test "x$prefix" != "xNONE" ; then
- SPEEX_LIBS="-L$prefix/lib"
+ SPEEX_LIBS=""
fi
SPEEX_LIBS="$SPEEX_LIBS -lspeex"
Modified: freeswitch/trunk/libs/srtp/configure.in
==============================================================================
--- freeswitch/trunk/libs/srtp/configure.in (original)
+++ freeswitch/trunk/libs/srtp/configure.in Mon Dec 3 11:29:07 2007
@@ -40,7 +40,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
IN_LINE=""
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
@@ -63,7 +63,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -76,7 +76,7 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
new_AM_CFLAGS="-KPIC -DPIC"
- new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+ new_AM_LDFLAGS="-R${prefix}/lib"
FUNC_DEF=__func__
elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
SOLINK="-shared -Xlinker -x"
@@ -85,6 +85,18 @@
fi
DYNAMIC_LIB_EXTEN="so"
;;
+ i*6*-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
+ x86_64-*-freebsd*|amd64-*-freebsd*)
+ SOLINK="-shared -Xlinker -x"
+ new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops"
+ new_AM_LDFLAGS=""
+ DYNAMIC_LIB_EXTEN="so"
+ ;;
esac
# Enable 64 bit build
More information about the Freeswitch-svn
mailing list