Rob Sykes patch to make libsoxr build for Audacity

m4/audacity_checklib_libresample.m4

@@ -1,46 +0,0 @@
-dnl Add Audacity license?
-dnl Please increment the serial number below whenever you alter this macro
-dnl for the benefit of automatic macro update systems
-# audacity_checklib_libresample.m4 serial 1
-
-AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [
-
-   AC_ARG_WITH(libresample,
-               [AS_HELP_STRING([--with-libresample],
-                               [use libresample for sample rate conversion: [yes,no]])],
-               LIBRESAMPLE_ARGUMENT=$withval,
-               LIBRESAMPLE_ARGUMENT="unspecified")
-
-   if false ; then
-      AC_DEFINE(USE_LIBRESAMPLE, 1,
-                [Define if libresample support should be enabled])
-   fi
-
-   dnl see if libresample is installed on the system
-
-   dnl ... but libresample isn't generally installed as a system library...
-
-   LIBRESAMPLE_SYSTEM_AVAILABLE="no"
-
-   dnl see if libresample is available locally
-
-   AC_CHECK_FILE(${srcdir}/lib-src/libresample/include/libresample.h,
-                 resample_h_found="yes",
-                 resample_h_found="no")
-
-   if test "x$resample_h_found" = "xyes" ; then
-      LIBRESAMPLE_LOCAL_AVAILABLE="yes"
-      LIBRESAMPLE_LOCAL_LIBS="libresample.a"
-      LIBRESAMPLE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libresample/include'
-      LIBRESAMPLE_LOCAL_CPPSYMBOLS="USE_LIBRESAMPLE"
-
-      if test ! -f lib-src/libresample/Makefile ; then
-         LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample"
-      fi
-      AC_MSG_NOTICE([libresample libraries are available in the local tree])
-   else
-      LIBRESAMPLE_LOCAL_AVAILABLE="no"
-      AC_MSG_NOTICE([libresample libraries are NOT available in the local tree])
-   fi
-])
-

m4/audacity_checklib_libsamplerate.m4

@@ -1,57 +0,0 @@
-dnl Add Audacity / libsamplerate license?
-dnl Please increment the serial number below whenever you alter this macro
-dnl for the benefit of automatic macro update systems
-# audacity_checklib_libsamplerate.m4 serial 1
-
-AC_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [
-
-   AC_ARG_WITH(libsamplerate,
-               [AS_HELP_STRING([--with-libsamplerate],
-                               [use libsamplerate instead of libresample for sample rate conversion. Do not use in conjunction with VST plug-in support!])],
-               LIBSAMPLERATE_ARGUMENT=$withval,
-               LIBSAMPLERATE_ARGUMENT="unspecified")
-
-   if false ; then
-      AC_DEFINE(USE_LIBSAMPLERATE, 1,
-                [Define if libsamplerate support should be enabled])
-   fi
-
-   dnl see if libsamplerate is installed on the system
-
-   PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.2,
-                     samplerate_available_system="yes",
-                     samplerate_available_system="no")
-
-   if test "x$samplerate_available_system" = "xyes" ; then
-      LIBSAMPLERATE_SYSTEM_AVAILABLE="yes"
-      LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS
-      LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS
-      LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE"
-      AC_MSG_NOTICE([Libsamplerate libraries are available as system libraries])
-   else
-      LIBSAMPLERATE_SYSTEM_AVAILABLE="no"
-      AC_MSG_NOTICE([Libsamplerate libraries are NOT available as system libraries])
-   fi
-
-   dnl see if libsamplerate is available in the local tree
-
-   AC_CHECK_FILE(${srcdir}/lib-src/libsamplerate/src/samplerate.h,
-                 samplerate_h_found="yes",
-                 samplerate_h_found="no")
-
-   if test "x$samplerate_h_found" = "xyes" ; then
-      LIBSAMPLERATE_LOCAL_AVAILABLE="yes"
-      LIBSAMPLERATE_LOCAL_LIBS="libsamplerate.a"
-      LIBSAMPLERATE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsamplerate/src'
-      LIBSAMPLERATE_LOCAL_CPPSYMBOLS="USE_LIBSAMPLERATE"
-
-      if test ! -f lib-src/libsamplerate/Makefile ; then
-         LIBSAMPLERATE_LOCAL_CONFIG_SUBDIRS="lib-src/libsamplerate"
-      fi
-      AC_MSG_NOTICE([libsamplerate libraries are available in the local tree])
-   else
-      LIBSAMPLERATE_LOCAL_AVAILABLE="no"
-      AC_MSG_NOTICE([libsamplerate libraries are NOT available in the local tree])
-   fi
-])
-

m4/audacity_checklib_libsoxr.m4

@@ -0,0 +1,50 @@
+dnl Add Audacity license?
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_libsoxr.m4 serial 1
+
+AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+   AC_ARG_WITH(libsoxr,
+               [AS_HELP_STRING([--with-libsoxr],
+                               [use libsoxr for sample rate conversion: [yes,no]])],
+               LIBSOXR_ARGUMENT=$withval,
+               LIBSOXR_ARGUMENT="unspecified")
+
+   if true ; then
+      AC_DEFINE(USE_LIBSOXR, 1,
+                [Define if libsoxr support should be enabled])
+   fi
+
+   dnl see if libsoxr is installed on the system
+
+   dnl ... but libsoxr isn't yet generally installed as a system library...
+
+   LIBSOXR_SYSTEM_AVAILABLE="no"
+
+   dnl see if libsoxr is available locally
+
+   AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr-lsr.h,
+                 soxr_h_found="yes",
+                 soxr_h_found="no")
+
+   if test "x$soxr_h_found" = "xyes" ; then
+      LIBSOXR_LOCAL_AVAILABLE="yes"
+      LIBSOXR_LOCAL_LIBS="libsoxr-lsr.a libsoxr.a"
+      LIBSOXR_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsoxr/src'
+      LIBSOXR_LOCAL_CPPSYMBOLS="USE_LIBSOXR"
+
+      if test ! -f lib-src/libsoxr/Makefile ; then
+         LIBSOXR_LOCAL_CONFIG_SUBDIRS="lib-src/libsoxr"
+
+         # Breaks other other libraries in Audacity tree; but why is ./configure
+         # passing options specific to this library to other libraries?
+         #LIBSOXR_LOCAL_CONFIGURE_ARGS="\"-DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF\""
+      fi
+      AC_MSG_NOTICE([libsoxr libraries are available in the local tree])
+   else
+      LIBSOXR_LOCAL_AVAILABLE="no"
+      AC_MSG_NOTICE([libsoxr libraries are NOT available in the local tree])
+   fi
+])
+