1 --- dbus-1.1.2/configure.in.orig 2007-07-27 22:45:49.000000000 +0200
2 +++ dbus-1.1.2/configure.in 2007-10-31 18:40:18.011991524 +0100
7 -AC_CHECK_LIB(socket,socket)
8 -AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
9 +AC_SEARCH_LIBS(socket,socket)
10 +AC_CHECK_FUNC(gethostbyname,,[AC_SEARCH_LIBS(gethostbyname,nsl)])
12 AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist fpathconf setrlimit)
16 AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes)
20 if test x$have_libaudit = xyes ; then
21 SELINUX_LIBS="$SELINUX_LIBS -laudit"
24 AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support])
29 if test x$enable_x11 = xyes ; then
30 AC_DEFINE(DBUS_BUILD_X11,1,[Build X11-dependent code])
31 - DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
32 + DBUS_X_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
33 DBUS_X_CFLAGS="$X_CFLAGS"
36 --- dbus-1.1.2/dbus/Makefile.am.orig 2007-06-15 22:03:54.000000000 +0200
37 +++ dbus-1.1.2/dbus/Makefile.am 2007-10-31 18:50:16.870118503 +0100
39 libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@
41 libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@
42 +libdbus_convenience_la_LIBADD=$(CAP_LIBS)
44 ## note that TESTS has special meaning (stuff to use in make check)
45 ## so if adding tests not to be run in make check, don't add them to