mirror of
https://github.com/cookiengineer/audacity
synced 2026-01-16 17:41:15 +01:00
Update soundtouch to 1.7.1.
This commit is contained in:
lllucius
@@ -1,6 +1,6 @@
|
||||
dnl SoundTouch configure.ac, by David W. Durham
|
||||
dnl
|
||||
dnl $Id: configure.ac,v 1.9 2009-11-07 12:17:03 richardash1981 Exp $
|
||||
dnl $Id: configure.ac 141 2012-04-04 19:47:28Z oparviai $
|
||||
dnl
|
||||
dnl This file is part of SoundTouch, an audio processing library for pitch/time adjustments
|
||||
dnl
|
||||
@@ -19,29 +19,23 @@ dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
dnl Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_INIT(SoundTouch, 1.3.1, [http://www.surina.net/soundtouch])
|
||||
AC_INIT(SoundTouch, 1.7.0, [http://www.surina.net/soundtouch])
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
AC_CONFIG_MACRO_DIR([config/m4])
|
||||
AM_CONFIG_HEADER([include/soundtouch_config.h])
|
||||
AM_INIT_AUTOMAKE([-Wall foreign])
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_DISABLE_SHARED dnl This makes libtool only build static libs
|
||||
AM_INIT_AUTOMAKE
|
||||
#AC_DISABLE_SHARED dnl This makes libtool only build static libs
|
||||
AC_DISABLE_STATIC dnl This makes libtool only build shared libs
|
||||
#AC_GNU_SOURCE dnl enable posix extensions in glibc
|
||||
|
||||
AC_LANG(C++)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
dnl ############################################################################
|
||||
dnl # Checks for programs #
|
||||
dnl ############################################################################
|
||||
|
||||
dnl dmazzoni: Sorry, SoundTouch authors/packagers, but trying to override
|
||||
dnl CXXFLAGS ruins cross-compilation. Commenting this out.
|
||||
dnl CXXFLAGS= dnl AC_PROG_CXX automatically sets CXXFLAGS to -g -O2 if g++ is the C++ compiler and CXXFLAGS hasn't been set, so by setting CXXFLAGS, we can avoid this.
|
||||
|
||||
|
||||
AC_PROG_CXX
|
||||
#AC_PROG_AWK
|
||||
AC_PROG_CC
|
||||
@@ -62,12 +56,14 @@ dnl ############################################################################
|
||||
AC_HEADER_STDC
|
||||
#AC_HEADER_SYS_WAIT
|
||||
# add any others you want to check for here
|
||||
#AC_CHECK_HEADERS([fcntl.h limits.h stddef.h stdlib.h string.h sys/ioctl.h sys/vfs.h unistd.h])
|
||||
|
||||
|
||||
|
||||
|
||||
AC_CHECK_HEADERS([cpuid.h])
|
||||
|
||||
if test "x$ac_cv_header_cpuid_h" = "xno"; then
|
||||
AC_MSG_WARN([The cpuid.h file was not found therefore the x86 optimizations will be disabled.])
|
||||
AC_MSG_WARN([If using a x86 architecture and optimizations are desired then please install gcc (>= 4.3).])
|
||||
AC_MSG_WARN([If using a non-x86 architecture then this is expected and can be ignored.])
|
||||
fi
|
||||
|
||||
|
||||
dnl ############################################################################
|
||||
dnl # Checks for typedefs, structures, and compiler characteristics $
|
||||
@@ -84,24 +80,116 @@ AC_ARG_ENABLE(integer-samples,
|
||||
[default=yes]])],,
|
||||
[enable_integer_samples=no])
|
||||
|
||||
|
||||
|
||||
# Let the user enable/disable the x86 optimizations.
|
||||
# Useful when compiling on non-x86 architectures.
|
||||
AC_ARG_ENABLE([x86-optimizations],
|
||||
[AS_HELP_STRING([--enable-x86-optimizations],
|
||||
[use MMX or SSE optimization
|
||||
[default=yes]])],[enable_x86_optimizations="${enableval}"],
|
||||
[enable_x86_optimizations=yes])
|
||||
|
||||
# Tell the Makefile.am if the user wants to disable optimizations.
|
||||
# Makefile.am will enable them by default if support is available.
|
||||
# Note: We check if optimizations are supported a few lines down.
|
||||
AM_CONDITIONAL([X86_OPTIMIZATIONS], [test "x$enable_x86_optimizations" = "xyes"])
|
||||
|
||||
|
||||
if test "x$enable_integer_samples" = "xyes"; then
|
||||
echo "****** Integer sample type enabled ******"
|
||||
AC_DEFINE(INTEGER_SAMPLES,1,[Use Integer as Sample type])
|
||||
AC_DEFINE(SOUNDTOUCH_INTEGER_SAMPLES,1,[Use Integer as Sample type])
|
||||
else
|
||||
echo "****** Float sample type enabled ******"
|
||||
AC_DEFINE(FLOAT_SAMPLES,1,[Use Float as Sample type])
|
||||
AC_DEFINE(SOUNDTOUCH_FLOAT_SAMPLES,1,[Use Float as Sample type])
|
||||
fi
|
||||
|
||||
dnl LLL: Added to choose whether to use -msse or not
|
||||
AC_SUBST(FLAG_SSE)
|
||||
FLAG_SSE=
|
||||
saveflags=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS -msse"
|
||||
AC_TRY_COMPILE([],[],[FLAG_SSE="-msse"])
|
||||
CXXFLAGS="$saveflags"
|
||||
dnl LLL: Added to choose whether to use -msse or not
|
||||
|
||||
# Check if optimizations are supported in the system at build time.
|
||||
if test "x$enable_x86_optimizations" = "xyes" -a "x$ac_cv_header_cpuid_h" = "xyes"; then
|
||||
echo "****** x86 optimizations enabled ******"
|
||||
|
||||
original_saved_CXXFLAGS=$CXXFLAGS
|
||||
have_mmx_intrinsics=no
|
||||
OPT_CXXFLAGS="-mmmx -Winline"
|
||||
CXXFLAGS="$OPT_CXXFLAGS $CXXFLAGS"
|
||||
|
||||
# Check if the user can compile MMX code using intrinsics.
|
||||
# GCC supports MMX intrinsics since version 3.3
|
||||
# A more recent GCC (>= 4.3) is recommended.
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3))
|
||||
#error "Need GCC >= 3.3 for MMX intrinsics"
|
||||
#endif
|
||||
#include <mmintrin.h>
|
||||
int main () {
|
||||
__m64 loop = _mm_cvtsi32_si64 (1);
|
||||
return _mm_cvtsi64_si32 (loop);
|
||||
}]])],[have_mmx_intrinsics=yes])
|
||||
CXXFLAGS=$original_saved_CXXFLAGS
|
||||
|
||||
# Inform the user if we did or did not find MMX support.
|
||||
#
|
||||
# If we enable optimization and integer samples we only require MMX.
|
||||
# Disable optimizations in the SSTypes.h file if this is not the case.
|
||||
if test "x$have_mmx_intrinsics" = "xyes" ; then
|
||||
echo "****** MMX support found ******"
|
||||
else
|
||||
echo "****** No MMX support found ******"
|
||||
if test "x$enable_integer_samples" = "xyes"; then
|
||||
echo "****** Disabling optimizations. Using integer samples with no MMX support ******"
|
||||
AC_DEFINE([SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS],[1],[Do not use x86 optimizations])
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
have_sse_intrinsics=no
|
||||
OPT_CXXFLAGS="-msse -Winline"
|
||||
CXXFLAGS="$OPT_CXXFLAGS $CXXFLAGS"
|
||||
|
||||
# Check if the user can compile SSE code using intrinsics.
|
||||
# GCC supports SSE intrinsics since version 3.3
|
||||
# A more recent GCC (>= 4.3) is recommended.
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3))
|
||||
#error "Need GCC >= 3.3 for SSE intrinsics"
|
||||
#endif
|
||||
#include <xmmintrin.h>
|
||||
int main () {
|
||||
_mm_setzero_ps();
|
||||
return 0;
|
||||
}]])],[have_sse_intrinsics=yes])
|
||||
CXXFLAGS=$original_saved_CXXFLAGS
|
||||
|
||||
# Inform the user if we did or did not find SSE support.
|
||||
#
|
||||
# If we enable optimization and float samples we only require SSE.
|
||||
# Disable optimizations in the SSTypes.h file if this is not the case.
|
||||
if test "x$have_sse_intrinsics" = "xyes" ; then
|
||||
echo "****** SSE support found ******"
|
||||
else
|
||||
echo "****** No SSE support found ******"
|
||||
if test "x$enable_integer_samples" != "xyes"; then
|
||||
echo "****** Disabling optimizations. Using float samples with no SSE support ******"
|
||||
AC_DEFINE([SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS],[1],[Do not use x86 optimizations])
|
||||
fi
|
||||
fi
|
||||
|
||||
else
|
||||
# Disable optimizations in SSTypes.h since the user requested it.
|
||||
echo "****** x86 optimizations disabled ******"
|
||||
AC_DEFINE([SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS],[1],[Do not use x86 optimizations])
|
||||
fi
|
||||
|
||||
# SSTypes.h by default enables optimizations. Those already got disabled if
|
||||
# the user requested for it or if the system does not support them.
|
||||
#
|
||||
# Now tell the Makefile.am the optimizations that are supported.
|
||||
# Note:
|
||||
# Makefile.am already knows if the user asked for optimizations. We apply
|
||||
# optimizations by default (if support is available) and then disable all of
|
||||
# them if the user requested it.
|
||||
AM_CONDITIONAL([HAVE_MMX], [test "x$have_mmx_intrinsics" = "xyes"])
|
||||
AM_CONDITIONAL([HAVE_SSE], [test "x$have_sse_intrinsics" = "xyes"])
|
||||
|
||||
|
||||
dnl ############################################################################
|
||||
@@ -123,7 +211,7 @@ dnl add whatever functions you might want to check for here
|
||||
|
||||
|
||||
dnl ############################################################################
|
||||
dnl # Internationalization and Localization #
|
||||
dnl # Internationaliation and Localiation #
|
||||
dnl ############################################################################
|
||||
#AM_GNU_GETTEXT_VERSION([0.11.5])
|
||||
#AM_GNU_GETTEXT([external])
|
||||
@@ -140,14 +228,12 @@ AC_CONFIG_FILES([
|
||||
Makefile
|
||||
source/Makefile
|
||||
source/SoundTouch/Makefile
|
||||
source/example/Makefile
|
||||
source/example/SoundStretch/Makefile
|
||||
source/example/bpm/Makefile
|
||||
source/SoundStretch/Makefile
|
||||
include/Makefile
|
||||
])
|
||||
|
||||
AC_OUTPUT(
|
||||
soundtouch-1.0.pc
|
||||
soundtouch.pc
|
||||
)
|
||||
|
||||
dnl use 'echo' to put stuff here if you want a message to the builder
|
||||
|
||||
Reference in New Issue
Block a user