mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-25 08:38:39 +02:00
updated configure file after r12164
This commit is contained in:
parent
19ddc34cf3
commit
7de1a13772
150
configure
vendored
150
configure
vendored
@ -639,6 +639,8 @@ LIBMAD_LIBS
|
|||||||
LIBMAD_CFLAGS
|
LIBMAD_CFLAGS
|
||||||
SAMPLERATE_LIBS
|
SAMPLERATE_LIBS
|
||||||
SAMPLERATE_CFLAGS
|
SAMPLERATE_CFLAGS
|
||||||
|
SOXR_LIBS
|
||||||
|
SOXR_CFLAGS
|
||||||
SNDFILE_LIBS
|
SNDFILE_LIBS
|
||||||
SNDFILE_CFLAGS
|
SNDFILE_CFLAGS
|
||||||
WIDGETEXTRA_LIBS
|
WIDGETEXTRA_LIBS
|
||||||
@ -769,6 +771,8 @@ WIDGETEXTRA_CFLAGS
|
|||||||
WIDGETEXTRA_LIBS
|
WIDGETEXTRA_LIBS
|
||||||
SNDFILE_CFLAGS
|
SNDFILE_CFLAGS
|
||||||
SNDFILE_LIBS
|
SNDFILE_LIBS
|
||||||
|
SOXR_CFLAGS
|
||||||
|
SOXR_LIBS
|
||||||
SAMPLERATE_CFLAGS
|
SAMPLERATE_CFLAGS
|
||||||
SAMPLERATE_LIBS
|
SAMPLERATE_LIBS
|
||||||
LIBMAD_CFLAGS
|
LIBMAD_CFLAGS
|
||||||
@ -1478,6 +1482,8 @@ Some influential environment variables:
|
|||||||
C compiler flags for SNDFILE, overriding pkg-config
|
C compiler flags for SNDFILE, overriding pkg-config
|
||||||
SNDFILE_LIBS
|
SNDFILE_LIBS
|
||||||
linker flags for SNDFILE, overriding pkg-config
|
linker flags for SNDFILE, overriding pkg-config
|
||||||
|
SOXR_CFLAGS C compiler flags for SOXR, overriding pkg-config
|
||||||
|
SOXR_LIBS linker flags for SOXR, overriding pkg-config
|
||||||
SAMPLERATE_CFLAGS
|
SAMPLERATE_CFLAGS
|
||||||
C compiler flags for SAMPLERATE, overriding pkg-config
|
C compiler flags for SAMPLERATE, overriding pkg-config
|
||||||
SAMPLERATE_LIBS
|
SAMPLERATE_LIBS
|
||||||
@ -5985,64 +5991,79 @@ $as_echo "#define USE_LIBSOXR 1" >>confdefs.h
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for soxr_create in -lsoxr" >&5
|
|
||||||
$as_echo_n "checking for soxr_create in -lsoxr... " >&6; }
|
|
||||||
if ${ac_cv_lib_soxr_soxr_create+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-lsoxr $LIBS"
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
/* Override any GCC internal prototype to avoid an error.
|
pkg_failed=no
|
||||||
Use char because int might match the return type of a GCC
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOXR" >&5
|
||||||
builtin and then its argument prototype would still apply. */
|
$as_echo_n "checking for SOXR... " >&6; }
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
if test -n "$SOXR_CFLAGS"; then
|
||||||
#endif
|
pkg_cv_SOXR_CFLAGS="$SOXR_CFLAGS"
|
||||||
char soxr_create ();
|
elif test -n "$PKG_CONFIG"; then
|
||||||
int
|
if test -n "$PKG_CONFIG" && \
|
||||||
main ()
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.0.5\""; } >&5
|
||||||
{
|
($PKG_CONFIG --exists --print-errors "soxr >= 0.0.5") 2>&5
|
||||||
return soxr_create ();
|
ac_status=$?
|
||||||
;
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
return 0;
|
test $ac_status = 0; }; then
|
||||||
}
|
pkg_cv_SOXR_CFLAGS=`$PKG_CONFIG --cflags "soxr >= 0.0.5" 2>/dev/null`
|
||||||
_ACEOF
|
|
||||||
if ac_fn_cxx_try_link "$LINENO"; then :
|
|
||||||
ac_cv_lib_soxr_soxr_create=yes
|
|
||||||
else
|
else
|
||||||
ac_cv_lib_soxr_soxr_create=no
|
pkg_failed=yes
|
||||||
fi
|
fi
|
||||||
rm -f core conftest.err conftest.$ac_objext \
|
else
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
pkg_failed=untried
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
fi
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soxr_soxr_create" >&5
|
if test -n "$SOXR_LIBS"; then
|
||||||
$as_echo "$ac_cv_lib_soxr_soxr_create" >&6; }
|
pkg_cv_SOXR_LIBS="$SOXR_LIBS"
|
||||||
if test "x$ac_cv_lib_soxr_soxr_create" = xyes; then :
|
elif test -n "$PKG_CONFIG"; then
|
||||||
libsoxr_found="yes"
|
if test -n "$PKG_CONFIG" && \
|
||||||
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr >= 0.0.5\""; } >&5
|
||||||
|
($PKG_CONFIG --exists --print-errors "soxr >= 0.0.5") 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
test $ac_status = 0; }; then
|
||||||
|
pkg_cv_SOXR_LIBS=`$PKG_CONFIG --libs "soxr >= 0.0.5" 2>/dev/null`
|
||||||
else
|
else
|
||||||
libsoxr_found="no"
|
pkg_failed=yes
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
pkg_failed=untried
|
||||||
soxr_h_found="no"
|
|
||||||
|
|
||||||
ac_fn_cxx_check_header_mongrel "$LINENO" "soxr.h" "ac_cv_header_soxr_h" "$ac_includes_default"
|
|
||||||
if test "x$ac_cv_header_soxr_h" = xyes; then :
|
|
||||||
soxr_h_found="yes"
|
|
||||||
else
|
|
||||||
soxr_h_found="no"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$libsoxr_found" = "xyes" && test "x$soxr_h_found" = "xyes" ; then
|
if test $pkg_failed = yes; then
|
||||||
|
|
||||||
|
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||||
|
_pkg_short_errors_supported=yes
|
||||||
|
else
|
||||||
|
_pkg_short_errors_supported=no
|
||||||
|
fi
|
||||||
|
if test $_pkg_short_errors_supported = yes; then
|
||||||
|
SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "soxr >= 0.0.5" 2>&1`
|
||||||
|
else
|
||||||
|
SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors "soxr >= 0.0.5" 2>&1`
|
||||||
|
fi
|
||||||
|
# Put the nasty error message in config.log where it belongs
|
||||||
|
echo "$SOXR_PKG_ERRORS" >&5
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
soxr_available_system="no"
|
||||||
|
elif test $pkg_failed = untried; then
|
||||||
|
soxr_available_system="no"
|
||||||
|
else
|
||||||
|
SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS
|
||||||
|
SOXR_LIBS=$pkg_cv_SOXR_LIBS
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
|
$as_echo "yes" >&6; }
|
||||||
|
soxr_available_system="yes"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$soxr_available_system" = "xyes" ; then
|
||||||
LIBSOXR_SYSTEM_AVAILABLE="yes"
|
LIBSOXR_SYSTEM_AVAILABLE="yes"
|
||||||
LIBSOXR_SYSTEM_LIBS="-lsoxr"
|
LIBSOXR_SYSTEM_LIBS=$SOXR_LIBS
|
||||||
LIBSOXR_SYSTEM_CPPSYMBOLS="USE_SYSTEM_SOXR"
|
LIBSOXR_SYSTEM_CXXFLAGS=$SOXR_CFLAGS
|
||||||
|
LIBSOXR_SYSTEM_CPPSYMBOLS="USE_LIBSOXR"
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Soxr libraries are available as system libraries" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: Soxr libraries are available as system libraries" >&5
|
||||||
$as_echo "$as_me: Soxr libraries are available as system libraries" >&6;}
|
$as_echo "$as_me: Soxr libraries are available as system libraries" >&6;}
|
||||||
else
|
else
|
||||||
@ -6052,15 +6073,15 @@ $as_echo "$as_me: Soxr libraries are NOT available as system libraries" >&6;}
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr-lsr.h" | $as_tr_sh`
|
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr-lsr.h" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
|
||||||
$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr-lsr.h... " >&6; }
|
$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
|
||||||
if eval \${$as_ac_File+:} false; then :
|
if eval \${$as_ac_File+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
test "$cross_compiling" = yes &&
|
test "$cross_compiling" = yes &&
|
||||||
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
|
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
|
||||||
if test -r "${srcdir}/lib-src/libsoxr/src/soxr-lsr.h"; then
|
if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
|
||||||
eval "$as_ac_File=yes"
|
eval "$as_ac_File=yes"
|
||||||
else
|
else
|
||||||
eval "$as_ac_File=no"
|
eval "$as_ac_File=no"
|
||||||
@ -8546,22 +8567,19 @@ if test "$PORTAUDIO_USE_LOCAL" != "yes" && test "$PORTAUDIO_USE_SYSTEM" != "yes"
|
|||||||
as_fn_error $? "Audacity requires portaudio to be enabled" "$LINENO" 5
|
as_fn_error $? "Audacity requires portaudio to be enabled" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test x"$LIBSAMPLERATE_ARGUMENT" = x"unspecified" ; then
|
||||||
|
LIBSAMPLERATE_USE_LOCAL="no"
|
||||||
|
LIBSAMPLERATE_USE_SYSTEM="no"
|
||||||
|
fi
|
||||||
|
if test x"$LIBRESAMPLE_ARGUMENT" = x"unspecified" ; then
|
||||||
|
LIBRESAMPLE_USE_LOCAL="no"
|
||||||
|
LIBRESAMPLE_USE_SYSTEM="no"
|
||||||
|
fi
|
||||||
if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
|
if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Both libresample and libsamplerate are available" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: Both libresample and libsamplerate are requested: using libresample" >&5
|
||||||
$as_echo "$as_me: Both libresample and libsamplerate are available" >&6;}
|
$as_echo "$as_me: Both libresample and libsamplerate are requested: using libresample" >&6;}
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: deciding which to use based on arguments ..." >&5
|
LIBSAMPLERATE_USE_LOCAL="no"
|
||||||
$as_echo "$as_me: deciding which to use based on arguments ..." >&6;}
|
LIBSAMPLERATE_USE_SYSTEM="no"
|
||||||
if test x"$LIBSAMPLERATE_ARGUMENT" = x"unspecified" ; then
|
|
||||||
LIBSAMPLERATE_USE_LOCAL="no"
|
|
||||||
LIBSAMPLERATE_USE_SYSTEM="no"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Libsamplerate not explicitly requested, using libresample" >&5
|
|
||||||
$as_echo "$as_me: Libsamplerate not explicitly requested, using libresample" >&6;}
|
|
||||||
else
|
|
||||||
LIBRESAMPLE_USE_LOCAL="no"
|
|
||||||
LIBRESAMPLE_USE_SYSTEM="no"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Using libsamplerate as requested" >&5
|
|
||||||
$as_echo "$as_me: Using libsamplerate as requested" >&6;}
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user