summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2006-01-25 17:27:10 +0000
committerPierre Ossman <ossman@cendio.se>2006-01-25 17:27:10 +0000
commit917d8765c62779dc74b9e49dab4f12d9590859c5 (patch)
tree58e2563f2fdde2f169a41cdecde6185bc7d9c1ff
parent104797b5a0c869a668690d13737056646be198bc (diff)
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
-rw-r--r--configure.ac3
-rw-r--r--polyp/Makefile.am2
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1700c863..f2de1653 100644
--- 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 8712782f..3a0d2f21 100644
--- 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