]>
Commit | Line | Data |
---|---|---|
1aecc028 MB |
1 | diff -urN dbus-1.2.20/configure.in dbus-1.2.20.new/configure.in |
2 | --- dbus-1.2.20/configure.in 2010-02-03 18:09:08.000000000 +0100 | |
3 | +++ dbus-1.2.20.new/configure.in 2010-02-07 14:58:43.761263087 +0100 | |
cbd57d1f | 4 | @@ -387,7 +387,7 @@ |
fa1bfae4 JB |
5 | |
6 | #### Various functions | |
cbd57d1f | 7 | AC_SEARCH_LIBS(socket,[socket network]) |
8ec7f43e | 8 | -AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) |
8ec7f43e | 9 | +AC_CHECK_FUNC(gethostbyname,,[AC_SEARCH_LIBS(gethostbyname,nsl)]) |
fa1bfae4 | 10 | |
cbd57d1f | 11 | AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll) |
fa1bfae4 | 12 | |
1aecc028 | 13 | @@ -917,7 +917,7 @@ |
e6dd0d80 JB |
14 | |
15 | if test x$enable_x11 = xyes ; then | |
16 | AC_DEFINE(DBUS_BUILD_X11,1,[Build X11-dependent code]) | |
17 | - DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" | |
18 | + DBUS_X_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" | |
19 | DBUS_X_CFLAGS="$X_CFLAGS" | |
20 | else | |
21 | DBUS_X_LIBS= |