[polypaudio-commits] r461 - in /trunk: configure.ac polyp/Makefile.am

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Wed Jan 25 18:27:10 2006
New Revision: 461

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=461&root=polypaudio&view=rev
Log:
We get the -lcap through LIBS, so no need for CAP_LIBS.

Modified:
    trunk/configure.ac
    trunk/polyp/Makefile.am

Modified: trunk/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/configure.ac?rev=461&root=polypaudio&r1=460&r2=461&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jan 25 18:27:10 2006
@@ -258,10 +258,9 @@
         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 ####
 

Modified: trunk/polyp/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/polyp/Makefile.am?rev=461&root=polypaudio&r1=460&r2=461&view=diff
==============================================================================
--- trunk/polyp/Makefile.am (original)
+++ trunk/polyp/Makefile.am Wed Jan 25 18:27:10 2006
@@ -104,7 +104,7 @@
 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