We get the -lcap through LIBS, so no need for CAP_LIBS.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@461 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/configure.ac b/configure.ac
index 1700c86304925b57f7031ef3b8d41d69ee80ff37..f2de1653905a8d48ccc091a6f1cb6e57f5e0c0fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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_SEARCH_LIBS([cap_init], [cap], [CAP_LIBS='-lcap'], [CAP_LIBS=''])
+    AC_SEARCH_LIBS([cap_init], [cap])
     AC_CHECK_HEADERS([sys/capability.h])
 fi
-AC_SUBST(CAP_LIBS)
 
 #### pkg-config ####
 

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index 8712782fa699d5873fab1afe05bed2f399b37620..3a0d2f21c9daf46582efff2e18e26517977c00dc 100644 (file)
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -104,7 +104,7 @@ polypaudio_SOURCES = \
 polypaudio_CFLAGS = $(AM_CFLAGS)
 polypaudio_CPPFLAGS = $(AM_CPPFLAGS)
 polypaudio_LDADD = $(AM_LDADD) libpolypcore.la $(LIBLTDL) \
-               $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS)
+               $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS)
 polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
 
 if PREOPEN_MODS