- unify with template.init, short --pidfile for consistency

[packages/dbus.git] / dbus-nolibs.patch

diff --git a/dbus-nolibs.patch b/dbus-nolibs.patch
index 521ef4575bcd0eae72e9440163f0b175573ecce6..5a785a967a0e7d3761487323ee93cee99f461801 100644 (file)
--- a/dbus-nolibs.patch
+++ b/dbus-nolibs.patch
@@ -1,17 +1,16 @@
---- 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 @@
- fi
+diff -urN dbus-1.2.20/configure.in dbus-1.2.20.new/configure.in
+--- dbus-1.2.20/configure.in   2010-02-03 18:09:08.000000000 +0100
++++ dbus-1.2.20.new/configure.in       2010-02-07 14:58:43.761263087 +0100
+@@ -387,7 +387,7 @@
  
  #### Various functions
--AC_CHECK_LIB(socket,socket)
--AC_CHECK_LIB(nsl,gethostbyname)
-+AC_SEARCH_LIBS(socket,socket)
-+AC_SEARCH_LIBS(gethostbyname,nsl)
+ AC_SEARCH_LIBS(socket,[socket network])
+-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
++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 setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll)
  
-@@ -1083,7 +1083,7 @@
+@@ -917,7 +917,7 @@
  
  if test x$enable_x11 = xyes ; then
     AC_DEFINE(DBUS_BUILD_X11,1,[Build X11-dependent code])