[Opalvoip-svn] SF.net SVN: opalvoip:[22726] opal/branches/v3_6
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2009-05-27 00:49:28
|
Revision: 22726 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=22726&view=rev Author: rjongbloed Date: 2009-05-27 00:49:27 +0000 (Wed, 27 May 2009) Log Message: ----------- Applied patches: ID: 2796087 "sbc plugin doesn't link correctly with libsamplerate" ID: 2795830 "Let user to choose system iLBC" ID: 2795827 "fix --as-needed support and recents aclocal" thank you very much Mounir Lamouri Modified Paths: -------------- opal/branches/v3_6/configure opal/branches/v3_6/configure.ac opal/branches/v3_6/opal.m4 opal/branches/v3_6/plugins/audio/SBC/Makefile.in opal/branches/v3_6/plugins/audio/iLBC/Makefile.in opal/branches/v3_6/plugins/configure.ac Modified: opal/branches/v3_6/configure =================================================================== --- opal/branches/v3_6/configure 2009-05-27 00:10:41 UTC (rev 22725) +++ opal/branches/v3_6/configure 2009-05-27 00:49:27 UTC (rev 22726) @@ -702,7 +702,6 @@ PTLIBDIR PTLIB_CFLAGS PTLIB_LIBS - OPAL_PTLIB_SSL OPAL_PTLIB_ASN OPAL_PTLIB_EXPAT @@ -2067,6 +2066,10 @@ + + + + if test "x${CXXFLAGS}" = "x" ; then CXXFLAGS= fi @@ -5164,11 +5167,10 @@ { echo "$as_me:$LINENO: checking for PTLIB" >&5 echo $ECHO_N "checking for PTLIB... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$PTLIB_CFLAGS"; then - pkg_cv_PTLIB_CFLAGS="$PTLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$PTLIB_CFLAGS"; then + pkg_cv_PTLIB_CFLAGS="$PTLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ptlib >= \${PTLIB_REC_VERSION}\"") >&5 ($PKG_CONFIG --exists --print-errors "ptlib >= ${PTLIB_REC_VERSION}") 2>&5 ac_status=$? @@ -5178,15 +5180,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$PTLIB_LIBS"; then - pkg_cv_PTLIB_LIBS="$PTLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$PTLIB_LIBS"; then + pkg_cv_PTLIB_LIBS="$PTLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ptlib >= \${PTLIB_REC_VERSION}\"") >&5 ($PKG_CONFIG --exists --print-errors "ptlib >= ${PTLIB_REC_VERSION}") 2>&5 ac_status=$? @@ -5196,9 +5196,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -5211,9 +5210,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PTLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ptlib >= ${PTLIB_REC_VERSION}"` + PTLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ptlib >= ${PTLIB_REC_VERSION}" 2>&1` else - PTLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ptlib >= ${PTLIB_REC_VERSION}"` + PTLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "ptlib >= ${PTLIB_REC_VERSION}" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PTLIB_PKG_ERRORS" >&5 @@ -5276,11 +5275,10 @@ { echo "$as_me:$LINENO: checking for PTLIB" >&5 echo $ECHO_N "checking for PTLIB... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$PTLIB_CFLAGS"; then - pkg_cv_PTLIB_CFLAGS="$PTLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$PTLIB_CFLAGS"; then + pkg_cv_PTLIB_CFLAGS="$PTLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ptlib\"") >&5 ($PKG_CONFIG --exists --print-errors "ptlib") 2>&5 ac_status=$? @@ -5290,15 +5288,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$PTLIB_LIBS"; then - pkg_cv_PTLIB_LIBS="$PTLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$PTLIB_LIBS"; then + pkg_cv_PTLIB_LIBS="$PTLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ptlib\"") >&5 ($PKG_CONFIG --exists --print-errors "ptlib") 2>&5 ac_status=$? @@ -5308,9 +5304,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -5323,9 +5318,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PTLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ptlib"` + PTLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ptlib" 2>&1` else - PTLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ptlib"` + PTLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "ptlib" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PTLIB_PKG_ERRORS" >&5 @@ -5418,13 +5413,13 @@ old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -5467,7 +5462,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" if test "x$opal_ptlib_exists" != "xyes" ; then @@ -5479,13 +5474,13 @@ old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -5536,7 +5531,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has URL" >&5 @@ -5544,33 +5539,21 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "x" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then + if test "x$opal_ptlib_option" = "xno" ; then echo " ERROR: compulsory feature from PTLib disabled."; exit 1; - fi - else - ="$opal_ptlib_option" - - if test "x$opal_ptlib_option" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define 1 -_ACEOF - - fi fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -5621,7 +5604,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has STUN" >&5 @@ -5629,33 +5612,21 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "x" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then + if test "x$opal_ptlib_option" = "xno" ; then echo " ERROR: compulsory feature from PTLib disabled."; exit 1; - fi - else - ="$opal_ptlib_option" - - if test "x$opal_ptlib_option" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define 1 -_ACEOF - - fi fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -5706,7 +5677,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has SSL" >&5 @@ -5714,33 +5685,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_SSL" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_SSL="$opal_ptlib_option" + OPAL_PTLIB_SSL="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_SSL 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -5791,7 +5755,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has ASN.1" >&5 @@ -5799,33 +5763,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_ASN" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_ASN="$opal_ptlib_option" + OPAL_PTLIB_ASN="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_ASN 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -5876,7 +5833,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has expat" >&5 @@ -5884,33 +5841,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_EXPAT" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_EXPAT="$opal_ptlib_option" + OPAL_PTLIB_EXPAT="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_EXPAT 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -5961,7 +5911,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has video" >&5 @@ -5969,33 +5919,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_VIDEO" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_VIDEO="$opal_ptlib_option" + OPAL_PTLIB_VIDEO="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_VIDEO 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -6046,7 +5989,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has wavfile" >&5 @@ -6054,33 +5997,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_WAVFILE" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_WAVFILE="$opal_ptlib_option" + OPAL_PTLIB_WAVFILE="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_WAVFILE 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -6131,7 +6067,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has vxml" >&5 @@ -6139,33 +6075,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_VXML" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_VXML="$opal_ptlib_option" + OPAL_PTLIB_VXML="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_VXML 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -6216,7 +6145,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has ipv6" >&5 @@ -6224,33 +6153,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_IPV6" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_IPV6="$opal_ptlib_option" + OPAL_PTLIB_IPV6="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_IPV6 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -6301,7 +6223,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has dtmf" >&5 @@ -6309,33 +6231,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_DTMF" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_DTMF="$opal_ptlib_option" + OPAL_PTLIB_DTMF="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_DTMF 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -6386,7 +6301,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has ldap" >&5 @@ -6394,33 +6309,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_LDAP" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_LDAP="$opal_ptlib_option" + OPAL_PTLIB_LDAP="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_LDAP 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -6471,7 +6379,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has dns" >&5 @@ -6479,33 +6387,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_DNS" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_DNS="$opal_ptlib_option" + OPAL_PTLIB_DNS="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_DNS 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -6556,7 +6457,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has audio" >&5 @@ -6564,33 +6465,26 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_AUDIO" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_AUDIO="$opal_ptlib_option" + OPAL_PTLIB_AUDIO="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_AUDIO 1 _ACEOF - fi - fi + fi old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -6641,7 +6535,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has config" >&5 @@ -6649,22 +6543,15 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "xOPAL_PTLIB_CONFIG_FILE" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then - echo " ERROR: compulsory feature from PTLib disabled."; - exit 1; - fi - else - OPAL_PTLIB_CONFIG_FILE="$opal_ptlib_option" + OPAL_PTLIB_CONFIG_FILE="$opal_ptlib_option" - if test "x$opal_ptlib_option" = "xyes" ; then + if test "x$opal_ptlib_option" = "xyes" ; then cat >>confdefs.h <<\_ACEOF #define OPAL_PTLIB_CONFIG_FILE 1 _ACEOF - fi - fi + fi @@ -9078,11 +8965,10 @@ { echo "$as_me:$LINENO: checking for SPEEXDSP" >&5 echo $ECHO_N "checking for SPEEXDSP... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$SPEEXDSP_CFLAGS"; then - pkg_cv_SPEEXDSP_CFLAGS="$SPEEXDSP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$SPEEXDSP_CFLAGS"; then + pkg_cv_SPEEXDSP_CFLAGS="$SPEEXDSP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speexdsp\"") >&5 ($PKG_CONFIG --exists --print-errors "speexdsp") 2>&5 ac_status=$? @@ -9092,15 +8978,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$SPEEXDSP_LIBS"; then - pkg_cv_SPEEXDSP_LIBS="$SPEEXDSP_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$SPEEXDSP_LIBS"; then + pkg_cv_SPEEXDSP_LIBS="$SPEEXDSP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speexdsp\"") >&5 ($PKG_CONFIG --exists --print-errors "speexdsp") 2>&5 ac_status=$? @@ -9110,9 +8994,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -9125,9 +9008,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speexdsp"` + SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "speexdsp" 2>&1` else - SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speexdsp"` + SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --print-errors "speexdsp" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SPEEXDSP_PKG_ERRORS" >&5 @@ -10126,13 +10009,13 @@ if test "x$OPAL_H323" = "xyes" ; then old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi ac_ext=cpp @@ -10183,7 +10066,7 @@ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" { echo "$as_me:$LINENO: checking PTLIB has ASN" >&5 @@ -10191,21 +10074,9 @@ { echo "$as_me:$LINENO: result: $opal_ptlib_option" >&5 echo "${ECHO_T}$opal_ptlib_option" >&6; } - if test "x" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then + if test "x$opal_ptlib_option" = "xno" ; then echo " ERROR: compulsory feature from PTLib disabled."; exit 1; - fi - else - ="$opal_ptlib_option" - - if test "x$opal_ptlib_option" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define 1 -_ACEOF - - fi fi Modified: opal/branches/v3_6/configure.ac =================================================================== --- opal/branches/v3_6/configure.ac 2009-05-27 00:10:41 UTC (rev 22725) +++ opal/branches/v3_6/configure.ac 2009-05-27 00:49:27 UTC (rev 22726) @@ -291,8 +291,8 @@ OPAL_MSG_CHECK([ptlib version], [$PTLIB_VERSION]) OPAL_CHECK_PTLIB_EXISTS() -OPAL_CHECK_PTLIB([URL], [ptclib/url.h], [PURL url;], []) -OPAL_CHECK_PTLIB([STUN], [ptclib/pstun.h],[PSTUNClient client;], []) +OPAL_CHECK_PTLIB_MANDATORY([URL], [ptclib/url.h], [PURL url;]) +OPAL_CHECK_PTLIB_MANDATORY([STUN], [ptclib/pstun.h],[PSTUNClient client;]) OPAL_CHECK_PTLIB([SSL], [ptclib/pssl.h], [PSSLContext ctx;], [OPAL_PTLIB_SSL]) OPAL_CHECK_PTLIB([ASN.1], [ptclib/pasn.h], [PASNInteger asnint(5);], [OPAL_PTLIB_ASN]) OPAL_CHECK_PTLIB([expat], [ptclib/pxml.h], [PXMLParser parser;], [OPAL_PTLIB_EXPAT]) @@ -439,7 +439,7 @@ OPAL_SIMPLE_OPTION([h323],[OPAL_H323], [whether to enable H.323 protocol support]) if test "x$OPAL_H323" = "xyes" ; then - OPAL_CHECK_PTLIB([ASN], [ptclib/asner.h], [PPER_Stream per;], []) + OPAL_CHECK_PTLIB_MANDATORY([ASN], [ptclib/asner.h], [PPER_Stream per;]) fi dnl MSWIN_DISPLAY iax2,IAX2 support Modified: opal/branches/v3_6/opal.m4 =================================================================== --- opal/branches/v3_6/opal.m4 2009-05-27 00:10:41 UTC (rev 22725) +++ opal/branches/v3_6/opal.m4 2009-05-27 00:49:27 UTC (rev 22726) @@ -363,13 +363,13 @@ AC_DEFUN([OPAL_CHECK_PTLIB], [ old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi AC_LANG(C++) @@ -387,34 +387,69 @@ [opal_ptlib_option=no]) CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" OPAL_MSG_CHECK([PTLIB has $1], [$opal_ptlib_option]) - if test "x$4" = "x" ; then - if test "x$opal_ptlib_option" = "xno" ; then + $4="$opal_ptlib_option" + AC_SUBST($4) + if test "x$opal_ptlib_option" = "xyes" ; then + AC_DEFINE([$4], [1], [$1]) + fi + + ]) + +dnl OPAL_CHECK_PTLIB_MANDATORY +dnl Check if ptlib was compiled with a specific mandatory feature +dnl Arguments: $1 Name of feature +dnl $2 ptlib/pasn.h Header file to include +dnl $3 Code to test the feature +AC_DEFUN([OPAL_CHECK_PTLIB_MANDATORY], + [ + old_CXXFLAGS="$CXXFLAGS" + old_LIBS="$LIBS" + + CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" + if test "x${DEBUG_BUILD}" = xyes; then + LIBS="$LIBS $DEBUG_LIBS" + else + LIBS="$LIBS $RELEASE_LIBS" + fi + + AC_LANG(C++) + AC_LINK_IFELSE([ + #include <ptbuildopts.h> + #include <ptlib.h> + #include <$2> + + int main() + { + $3 + } + ], + [opal_ptlib_option=yes], + [opal_ptlib_option=no]) + + CXXFLAGS="$old_CXXFLAGS" + LIBS="$old_LIBS" + + OPAL_MSG_CHECK([PTLIB has $1], [$opal_ptlib_option]) + if test "x$opal_ptlib_option" = "xno" ; then echo " ERROR: compulsory feature from PTLib disabled."; exit 1; - fi - else - $4="$opal_ptlib_option" - AC_SUBST($4) - if test "x$opal_ptlib_option" = "xyes" ; then - AC_DEFINE([$4], [1], [$1]) - fi fi - - ]) + ]) + AC_DEFUN([OPAL_CHECK_PTLIB_EXISTS], [ old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS" if test "x${DEBUG_BUILD}" = xyes; then - LDFLAGS="$LDFLAGS $DEBUG_LIBS" + LIBS="$LIBS $DEBUG_LIBS" else - LDFLAGS="$LDFLAGS $RELEASE_LIBS" + LIBS="$LIBS $RELEASE_LIBS" fi AC_LANG(C++) @@ -424,7 +459,7 @@ [opal_ptlib_exists=no]) CXXFLAGS="$old_CXXFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" if test "x$opal_ptlib_exists" != "xyes" ; then @@ -972,3 +1007,41 @@ fi AS_IF([test AS_VAR_GET([opal_java]) = yes], [$1], [$2])[] ]) + +dnl OPAL_DETERMINE_ILBC +dnl Determine whether to use the system or internal iLBC (can be forced) +dnl Arguments: none +dnl Return: $ILBC_SYSTEM whether system or internal iLBC shall be used +dnl $ILBC_CFLAGS system iLBC CFLAGS if using system iLBC +dnl $ILBC_LIBS system iLBC LIBS if using system iLBC +AC_DEFUN([OPAL_DETERMINE_ILBC], + [AC_ARG_ENABLE([localilbc], + [AC_HELP_STRING([--enable-localilbc],[Force use local version of iLBC library rather than system version])], + [localilbc=$enableval], + [localilbc=]) + + if test "x${localilbc}" = "xyes" ; then + AC_MSG_NOTICE(forcing use of local iLBC sources) + ILBC_SYSTEM=no + else + AC_MSG_NOTICE(checking if iLBC is installed) + + saved_LIBS="$LIBS" + LIBS="$LIBS -lilbc" + AC_CHECK_LIB(ilbc, iLBC_encode, [has_ilbc=yes], [has_ilbc=no]) + LIBS=$saved_LIBS + + if test "x${has_ilbc}" = "xyes"; then + AC_CHECK_HEADERS([ilbc/iLBC_decode.h ilbc/iLBC_define.h ilbc/iLBC_encode.h], [has_ilbc=yes], [has_ilbc=no]) + fi + + if test "x${has_ilbc}" = "xyes"; then + ILBC_CFLAGS="" + ILBC_LIBS="-lilbc" + ILBC_SYSTEM=yes + else + ILBC_SYSTEM=no + fi + OPAL_MSG_CHECK([System iLBC], [$has_ilbc]) + fi + ]) Modified: opal/branches/v3_6/plugins/audio/SBC/Makefile.in =================================================================== --- opal/branches/v3_6/plugins/audio/SBC/Makefile.in 2009-05-27 00:10:41 UTC (rev 22725) +++ opal/branches/v3_6/plugins/audio/SBC/Makefile.in 2009-05-27 00:49:27 UTC (rev 22726) @@ -30,7 +30,7 @@ SRCDIR = . PLUGINDIR=../.. SONAME = sbccodec -SAMPLERATELIB = -Lsamplerate +SAMPLERATE_LIB = -lsamplerate CC =@CC@ CFLAGS =@CFLAGS@ Modified: opal/branches/v3_6/plugins/audio/iLBC/Makefile.in =================================================================== --- opal/branches/v3_6/plugins/audio/iLBC/Makefile.in 2009-05-27 00:10:41 UTC (rev 22725) +++ opal/branches/v3_6/plugins/audio/iLBC/Makefile.in 2009-05-27 00:49:27 UTC (rev 22726) @@ -78,13 +78,26 @@ LDFLAGS =@LDFLAGS@ EXTRACFLAGS =-I$(PLUGINDIR) -SRCS = ilbccodec.c $(SRCDIR)/anaFilter.c $(SRCDIR)/constants.c $(SRCDIR)/createCB.c $(SRCDIR)/doCPLC.c \ +ILBC_CFLAGS=@ILBC_CFLAGS@ +ILBC_LIBS=@ILBC_LIBS@ +ILBC_SYSTEM=@ILBC_SYSTEM@ + +SRCS = ilbccodec.c + +ifeq ($(ILBC_SYSTEM),no) +SRCS += $(SRCDIR)/anaFilter.c $(SRCDIR)/constants.c $(SRCDIR)/createCB.c $(SRCDIR)/doCPLC.c \ $(SRCDIR)/enhancer.c $(SRCDIR)/filter.c $(SRCDIR)/FrameClassify.c $(SRCDIR)/gainquant.c \ $(SRCDIR)/getCBvec.c $(SRCDIR)/helpfun.c $(SRCDIR)/hpInput.c $(SRCDIR)/hpOutput.c \ $(SRCDIR)/iCBConstruct.c $(SRCDIR)/iCBSearch.c $(SRCDIR)/iLBC_decode.c $(SRCDIR)/iLBC_encode.c \ $(SRCDIR)/LPCdecode.c $(SRCDIR)/LPCencode.c $(SRCDIR)/lsf.c $(SRCDIR)/packing.c \ $(SRCDIR)/StateConstructW.c $(SRCDIR)/StateSearchW.c $(SRCDIR)/syntFilter.c +EXTRALIBS = +else +EXTRACFLAGS += $(IBLC_CFLAGS) +EXTRALIBS = $(ILBC_LIBS) +endif + OBJDIR = ./obj vpath %.o $(OBJDIR) @@ -100,9 +113,9 @@ $(PLUGIN): $(OBJECTS) ifeq (solaris,$(findstring solaris,$(target_os))) - $(CC) $(LDSO) $@ -o $@ $^ + $(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS) else - $(CC) $(LDSO) -o $@ $^ + $(CC) $(LDSO) -o $@ $^ $(EXTRALIBS) endif install: Modified: opal/branches/v3_6/plugins/configure.ac =================================================================== --- opal/branches/v3_6/plugins/configure.ac 2009-05-27 00:10:41 UTC (rev 22725) +++ opal/branches/v3_6/plugins/configure.ac 2009-05-27 00:49:27 UTC (rev 22726) @@ -181,6 +181,14 @@ AC_SUBST(SPEEX_CFLAGS) AC_SUBST(SPEEX_LIBS) +dnl ######################## +dnl iLBC (system/local) +dnl ######################## +OPAL_DETERMINE_ILBC() +AC_SUBST(ILBC_SYSTEM) +AC_SUBST(ILBC_CFLAGS) +AC_SUBST(ILBC_LIBS) + dnl ######################################################################## dnl sbc,Bluetooth SBC for telephony with CD quality @@ -222,6 +230,7 @@ AC_SUBST(LIBAVCODEC_CFLAGS) AC_SUBST(LIBAVCODEC_LIBS) AC_DEFINE([HAVE_LIBAVCODEC], [1], [ffmpeg]) + AC_SUBST(LIBAVCODEC_LIB_NAME) HAVE_LIBAVCODEC=yes OPAL_LIBAVCODEC_HACK case "$target_os" in @@ -232,15 +241,13 @@ HAVE_H264_DECODER=yes ;; * ) - OPAL_GET_LIBNAME([LIBAVCODEC], [libavcodec], [$LIBAVCODEC_LIBS]) - OPAL_CHECK_LIBAVCODEC([h263p_encoder], [HAVE_H263P=yes], [HAVE_H263P=no]) - OPAL_CHECK_LIBAVCODEC([mpeg4_encoder], [HAVE_MPEG4=yes], [HAVE_MPEG4=no]) - OPAL_CHECK_LIBAVCODEC([h264_decoder], [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no]) + AC_CHECK_LIB(avcodec, h263p_encoder, [HAVE_H263P=yes], [HAVE_H263P=no]) + AC_CHECK_LIB(avcodec, mpeg4_encoder, [HAVE_MPEG4=yes], [HAVE_MPEG4=no]) + AC_CHECK_LIB(avcodec, h264_decoder, [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no]) ;; esac AC_SUBST(HAVE_H263P) AC_SUBST(HAVE_MPEG4) - AC_SUBST(LIBAVCODEC_LIB_NAME) OPAL_LIBAVCODEC_HEADER ], [ @@ -516,7 +523,12 @@ fi echo " gsm-amr : yes" -echo " iLBC : yes" +if test "x${ILBC_SYSTEM}" = "xyes" ; then +echo " iLBC : yes (system)" +else +echo " iLBC : yes (internal)" +fi + if test "x${SPEEX_SYSTEM}" = "xyes" ; then echo " Speex : yes (system, version $SPEEX_SYSTEM_VERSION)" else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |