Fixes for the new infrastructure so that the waveout module compiles.

[pulseaudio] / configure.ac

diff --git a/configure.ac b/configure.ac
index bfe6ecd121c6a32d8167b99cefbf36876a19cb70..710f205b9c2c83007566c81e29d78a046340fd6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -185,13 +185,13 @@ AC_CHECK_DEFINE([INADDR_NONE], [netinet/in.h], [],
 #### Check for libs ####
 
 # ISO
-AC_CHECK_LIB([m], [pow])
+AC_SEARCH_LIBS([pow], [m])
 
 # POSIX
-AC_CHECK_LIB([rt], [sched_setscheduler])
+AC_SEARCH_LIBS([sched_setscheduler], [rt])
 
 # BSD
-AC_CHECK_LIB([socket], [connect])
+AC_SEARCH_LIBS([connect], [socket])
 
 # Non-standard
 
@@ -258,10 +258,9 @@ AC_ARG_WITH(
         AC_HELP_STRING([--without-caps],[Omit support for POSIX capabilities.]))
 
 if test "x${with_caps}" != "xno"; then
-    AC_CHECK_LIB(cap, cap_init, [CAP_LIBS='-lcap'], [CAP_LIBS=''])
+    AC_SEARCH_LIBS([cap_init], [cap])
     AC_CHECK_HEADERS([sys/capability.h])
 fi
-AC_SUBST(CAP_LIBS)
 
 #### pkg-config ####
 
@@ -331,6 +330,11 @@ AC_SUBST(HOWL_LIBS)
 AC_SUBST(HAVE_HOWL)
 AM_CONDITIONAL([HAVE_HOWL], [test "x$HAVE_HOWL" = x1])
 
+
+PKG_CHECK_MODULES(LIBOIL, [ liboil-0.3 >= 0.3.0 ])
+AC_SUBST(LIBOIL_CFLAGS)
+AC_SUBST(LIBOIL_LIBS)
+
 #### Async DNS support (optional) ####
 
 PKG_CHECK_MODULES(LIBASYNCNS, [ libasyncns >= 0.1 ], HAVE_LIBASYNCNS=1, HAVE_LIBASYNCNS=0)