summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-02 21:22:30 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-02 21:22:30 +0000
commitb6bfaa9249619cb4b71f05aa583c3cc34bbc6b36 (patch)
treeb09cf9d39b1efa2d3bcd4c15cd5e9a73012bb3a7
parent2e8244b4bcaae3f7b1cb45ceb503d3b13f539d25 (diff)
add missing configure.ac part of the libsamplerate patch from r1753, re #125
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1754 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--configure.ac43
1 files changed, 37 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 718ebbff..e0453aab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,12 +323,6 @@ fi
PKG_PROG_PKG_CONFIG
-#### Sample rate conversion ####
-
-PKG_CHECK_MODULES(LIBSAMPLERATE, [ samplerate >= 0.1.0 ])
-AC_SUBST(LIBSAMPLERATE_CFLAGS)
-AC_SUBST(LIBSAMPLERATE_LIBS)
-
#### Sound file ####
PKG_CHECK_MODULES(LIBSNDFILE, [ sndfile >= 1.0.10 ])
@@ -346,6 +340,37 @@ if test "x$os_is_win32" != "x1" ; then
LIBS="$LIBS -latomic_ops"
fi
+#### Libsamplerate support (optional) ####
+
+AC_ARG_ENABLE([samplerate],
+ AC_HELP_STRING([--disable-samplerate], [Disable optional libsamplerate support]),
+ [
+ case "${enableval}" in
+ yes) samplerate=yes ;;
+ no) samplerate=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-samplerate) ;;
+ esac
+ ],
+ [samplerate=auto])
+
+if test "x${samplerate}" != xno ; then
+ PKG_CHECK_MODULES(LIBSAMPLERATE, [ samplerate >= 0.1.0 ],
+ HAVE_LIBSAMPLERATE=1,
+ [
+ HAVE_LIBSAMPLERATE=0
+ if test "x$samplerate" = xyes ; then
+ AC_MSG_ERROR([*** Libsamplerate not found])
+ fi
+ ])
+else
+ HAVE_LIBSAMPLERATE=0
+fi
+
+AC_SUBST(LIBSAMPLERATE_CFLAGS)
+AC_SUBST(LIBSAMPLERATE_LIBS)
+AC_SUBST(HAVE_LIBSAMPLERATE)
+AM_CONDITIONAL([HAVE_LIBSAMPLERATE], [test "x$HAVE_LIBSAMPLERATE" = x1])
+
#### OSS support (optional) ####
AC_ARG_ENABLE([oss],
@@ -844,6 +869,11 @@ if test "x${LIBWRAP_LIBS}" != x ; then
ENABLE_TCPWRAP=yes
fi
+ENABLE_LIBSAMPLERATE=no
+if test "x${HAVE_LIBSAMPLERATE}" = "x1" ; then
+ ENABLE_LIBSAMPLERATE=yes
+fi
+
echo "
---{ $PACKAGE_NAME $VERSION }---
@@ -865,6 +895,7 @@ echo "
Enable LIRC: ${ENABLE_LIRC}
Enable HAL: ${ENABLE_HAL}
Enable TCP Wrappers: ${ENABLE_TCPWRAP}
+ Enable libsamplerate: ${ENABLE_LIBSAMPLERATE}
System User: ${PA_SYSTEM_USER}
System Group: ${PA_SYSTEM_GROUP}
Realtime Group: ${PA_REALTIME_GROUP}