- use -lcap where needed only

Changed files:
    dbus-nolibs.patch -> 1.4

diff --git a/dbus-nolibs.patch b/dbus-nolibs.patch
index 4f89bb09a9c23541111849fea3f8eeb93a0c664b..7a4f6b50f716506d12e1c009b2288c23e28bebbe 100644 (file)
--- a/dbus-nolibs.patch
+++ b/dbus-nolibs.patch
@@ -1,6 +1,6 @@
---- dbus-0.11/configure.in.orig        Thu Aug 28 10:57:36 2003
-+++ dbus-0.11/configure.in     Thu Aug 28 11:01:51 2003
-@@ -228,8 +228,8 @@
+--- dbus-1.1.2/configure.in.orig       2007-07-27 22:45:49.000000000 +0200
++++ dbus-1.1.2/configure.in    2007-10-31 18:40:18.011991524 +0100
+@@ -554,8 +554,8 @@
  fi
  
  #### Various functions
@@ -9,9 +9,22 @@
 +AC_SEARCH_LIBS(socket,socket)
 +AC_CHECK_FUNC(gethostbyname,,[AC_SEARCH_LIBS(gethostbyname,nsl)])
  
- AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist)
+ AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist fpathconf setrlimit)
  
-@@ -1083,7 +1083,7 @@
+@@ -946,9 +946,11 @@
+ 
+ AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes)
+ 
++AC_SUBST(CAP_LIBS)
++CAP_LIBS=
+ if test x$have_libaudit = xyes ; then
+     SELINUX_LIBS="$SELINUX_LIBS -laudit"
+-    LIBS="-lcap $LIBS"
++    CAP_LIBS="-lcap"
+     AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support])
+ fi
+ 
+@@ -988,7 +990,7 @@
  
  if test x$enable_x11 = xyes ; then
     AC_DEFINE(DBUS_BUILD_X11,1,[Build X11-dependent code])
@@ -20,3 +33,13 @@
     DBUS_X_CFLAGS="$X_CFLAGS"
  else
     DBUS_X_LIBS=
+--- dbus-1.1.2/dbus/Makefile.am.orig   2007-06-15 22:03:54.000000000 +0200
++++ dbus-1.1.2/dbus/Makefile.am        2007-10-31 18:50:16.870118503 +0100
+@@ -176,6 +176,7 @@
+ libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@
+ 
+ libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@
++libdbus_convenience_la_LIBADD=$(CAP_LIBS)
+ 
+ ## note that TESTS has special meaning (stuff to use in make check)
+ ## so if adding tests not to be run in make check, don't add them to