diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2011-10-24 09:28:13 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2011-10-24 09:28:13 +0000 |
| commit | 2068f13bc42cf3a47374aa2765f82724a5782028 (patch) | |
| tree | 29fbeaa152ab51e59b650c0d7cd83a38111e1ecc /aconfigure.ac | |
| parent | 1c72a42676e7aa0c2ae0734549050f738f3bdf02 (diff) | |
Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk
* Backport of r3557:r3832
TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3841 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'aconfigure.ac')
| -rw-r--r-- | aconfigure.ac | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/aconfigure.ac b/aconfigure.ac index 0ce90d41..3270863c 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -52,7 +52,7 @@ if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi AC_SUBST(AR) if test "$LD" = ""; then LD="$CC"; fi AC_SUBST(LD) -if test "$LDOUT" = ""; then LDOUT="-o"; fi +if test "$LDOUT" = ""; then LDOUT="-o "; fi AC_SUBST(LDOUT) if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi AC_SUBST(RANLIB) @@ -62,7 +62,7 @@ if test "$LIBEXT" = ""; then LIBEXT='a'; fi AC_SUBST(LIBEXT) if test "$LIBEXT2" = ""; then LIBEXT2=""; fi AC_SUBST(LIBEXT2) -if test "$CC_OUT" = ""; then CC_OUT="-o"; fi +if test "$CC_OUT" = ""; then CC_OUT="-o "; fi AC_SUBST(CC_OUT) if test "$CC_INC" = ""; then CC_INC="-I"; fi AC_SUBST(CC_INC) @@ -127,6 +127,12 @@ dnl Endianness detection dnl AC_C_BIGENDIAN +if test "x$ac_cv_c_bigendian" = "xyes"; then + CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" +else + CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" +fi + dnl dnl Legacy macros dnl @@ -1178,6 +1184,34 @@ AC_ARG_ENABLE(ssl, fi ]) +dnl # Include opencore-amrnb support +AC_SUBST(ac_no_opencore_amrnb) +AC_ARG_ENABLE(opencore_amrnb, + AC_HELP_STRING([--disable-opencore-amrnb], + [Exclude OpenCORE AMR-NB support from the build (default: autodetect)]) + , + [ + if test "$enable_opencore_amrnb" = "no"; then + [ac_no_opencore_amrnb=1] + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,0) + AC_MSG_RESULT([Checking if OpenCORE AMR-NB support is disabled... yes]) + fi + ], + [ + AC_MSG_RESULT([checking for OpenCORE AMR-NB installations..]) + AC_SUBST(opencore_amrnb_h_present) + AC_SUBST(opencore_amrnb_present) + AC_CHECK_HEADER(opencore-amrnb/interf_enc.h,[opencore_amrnb_h_present=1]) + AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"]) + if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then + AC_MSG_RESULT([OpenCORE AMR-NB library found, AMR-NB support enabled]) + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,1) + else + [ac_no_opencore_amrnb=1] + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,0) + fi + ]) + dnl ########################################## dnl # |