From 3ebc56ad37b5254faadec0ca4eeae9559338815b Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Tue, 12 Mar 2013 10:45:25 -0500 Subject: Allow disabling resample support, via configure script. --- aconfigure | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'aconfigure') diff --git a/aconfigure b/aconfigure index 78d7291..d3a089b 100755 --- a/aconfigure +++ b/aconfigure @@ -641,6 +641,7 @@ ac_pa_use_alsa ac_pa_cflags ac_external_pa ac_pjmedia_snd +ac_pjmedia_resample ac_external_srtp ac_external_gsm ac_external_speex @@ -733,6 +734,7 @@ enable_shared with_external_speex with_external_gsm with_external_srtp +enable_resample enable_sound with_external_pa enable_oss @@ -1400,6 +1402,7 @@ Optional Features: Disable floating point where possible --enable-epoll Use /dev/epoll ioqueue on Linux (experimental) --enable-shared Build shared libraries + --disable-resample Disable resampling implementations --disable-sound Exclude sound (i.e. use null sound) --disable-oss Disable OSS audio (default: not disabled) --disable-video Disable video feature @@ -1414,8 +1417,7 @@ Optional Features: --disable-g7221-codec Exclude G.7221 codec in the build --disable-speex-codec Exclude Speex codecs in the build --disable-ilbc-codec Exclude iLBC codec in the build - --enable-libsamplerate Link with libsamplerate when available. Note that - PJMEDIA_RESAMPLE_IMP must also be configured + --enable-libsamplerate Link with libsamplerate when available. --enable-resample-dll Build libresample as shared library --disable-sdl Disable SDL (default: not disabled) --disable-ffmpeg Disable ffmpeg (default: not disabled) @@ -5631,6 +5633,19 @@ fi +ac_pjmedia_resample=libresample + +# Check whether --enable-resample was given. +if test "${enable_resample+set}" = set; then : + enableval=$enable_resample; if test "$enable_resample" = "no"; then + ac_pjmedia_resample=none + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if resampling is disabled...yes" >&5 +$as_echo "Checking if resampling is disabled...yes" >&6; } + fi + +fi + + # Check whether --enable-sound was given. if test "${enable_sound+set}" = set; then : @@ -6088,6 +6103,7 @@ _ACEOF fi + ac_pjmedia_resample=libsamplerate else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Skipping libsamplerate detection" >&5 $as_echo "Skipping libsamplerate detection" >&6; } @@ -7285,20 +7301,20 @@ $as_echo "OpenCORE AMR-NB library found, AMR-NB support enabled" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "vo-amrwbenc/enc_if.h" "ac_cv_header_vo_amrwbenc_enc_if_h" "$ac_includes_default" -if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = xyes; then : +if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = x""yes; then : opencore_amrwb_enc_h_present=1 fi ac_fn_c_check_header_mongrel "$LINENO" "opencore-amrwb/dec_if.h" "ac_cv_header_opencore_amrwb_dec_if_h" "$ac_includes_default" -if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = xyes; then : +if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = x""yes; then : opencore_amrwb_dec_h_present=1 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for D_IF_init in -lopencore-amrwb" >&5 $as_echo_n "checking for D_IF_init in -lopencore-amrwb... " >&6; } -if ${ac_cv_lib_opencore_amrwb_D_IF_init+:} false; then : +if test "${ac_cv_lib_opencore_amrwb_D_IF_init+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7332,13 +7348,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrwb_D_IF_init" >&5 $as_echo "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; } -if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes; then : +if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = x""yes; then : opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5 $as_echo_n "checking for E_IF_init in -lvo-amrwbenc... " >&6; } -if ${ac_cv_lib_vo_amrwbenc_E_IF_init+:} false; then : +if test "${ac_cv_lib_vo_amrwbenc_E_IF_init+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7372,7 +7388,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vo_amrwbenc_E_IF_init" >&5 $as_echo "$ac_cv_lib_vo_amrwbenc_E_IF_init" >&6; } -if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = xyes; then : +if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = x""yes; then : opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc" fi @@ -7431,14 +7447,14 @@ $as_echo "Using SILK prefix... $with_silk" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "SKP_Silk_SDK_API.h" "ac_cv_header_SKP_Silk_SDK_API_h" "$ac_includes_default" -if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = xyes; then : +if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = x""yes; then : silk_h_present=1 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK" >&5 $as_echo_n "checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK... " >&6; } -if ${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+:} false; then : +if test "${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7472,7 +7488,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&5 $as_echo "$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&6; } -if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = xyes; then : +if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = x""yes; then : silk_present=1 && LIBS="$LIBS -lSKP_SILK_SDK" fi -- cgit v1.2.3