[pulseaudio-commits] r1754 - /branches/lennart/configure.ac

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sun Sep  2 23:22:30 2007
New Revision: 1754

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1754&root=3Dpulseaudio&vi=
ew=3Drev
Log:
add missing configure.ac part of the libsamplerate patch from r1753, re #125

Modified:
    branches/lennart/configure.ac

Modified: branches/lennart/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/configure.ac?r=
ev=3D1754&root=3Dpulseaudio&r1=3D1753&r2=3D1754&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/configure.ac (original)
+++ branches/lennart/configure.ac Sun Sep  2 23:22:30 2007
@@ -323,12 +323,6 @@
 =

 PKG_PROG_PKG_CONFIG
 =

-#### Sample rate conversion ####
-
-PKG_CHECK_MODULES(LIBSAMPLERATE, [ samplerate >=3D 0.1.0 ])
-AC_SUBST(LIBSAMPLERATE_CFLAGS)
-AC_SUBST(LIBSAMPLERATE_LIBS)
-
 #### Sound file ####
 =

 PKG_CHECK_MODULES(LIBSNDFILE, [ sndfile >=3D 1.0.10 ])
@@ -345,6 +339,37 @@
 if test "x$os_is_win32" !=3D "x1" ; then
     LIBS=3D"$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=3Dyes ;;
+                no) samplerate=3Dno ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --disable-sampl=
erate) ;;
+            esac
+        ],
+        [samplerate=3Dauto])
+
+if test "x${samplerate}" !=3D xno ; then
+    PKG_CHECK_MODULES(LIBSAMPLERATE, [ samplerate >=3D 0.1.0 ],
+        HAVE_LIBSAMPLERATE=3D1,
+        [
+            HAVE_LIBSAMPLERATE=3D0
+            if test "x$samplerate" =3D xyes ; then
+                AC_MSG_ERROR([*** Libsamplerate not found])
+            fi
+        ])
+else
+    HAVE_LIBSAMPLERATE=3D0
+fi
+
+AC_SUBST(LIBSAMPLERATE_CFLAGS)
+AC_SUBST(LIBSAMPLERATE_LIBS)
+AC_SUBST(HAVE_LIBSAMPLERATE)
+AM_CONDITIONAL([HAVE_LIBSAMPLERATE], [test "x$HAVE_LIBSAMPLERATE" =3D x1])
 =

 #### OSS support (optional) ####
 =

@@ -842,6 +867,11 @@
 ENABLE_TCPWRAP=3Dno
 if test "x${LIBWRAP_LIBS}" !=3D x ; then
    ENABLE_TCPWRAP=3Dyes
+fi
+
+ENABLE_LIBSAMPLERATE=3Dno
+if test "x${HAVE_LIBSAMPLERATE}" =3D "x1" ; then
+   ENABLE_LIBSAMPLERATE=3Dyes
 fi
 =

 echo "
@@ -865,6 +895,7 @@
     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}