X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=5e04b518eeba8af17747335a58d84015d5595231;hb=4ce7381227326afbc0f50ee0608fab712689d465;hp=212251731552ebdb422b3a3223d0eba7499db55f;hpb=fba1d4659331eaa2f2b2b95b4edd7458eaaa6288;p=netatalk.git diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 21225173..5e04b518 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -37,7 +37,7 @@ dnl Check for dbus-glib, for AFP stats AC_DEFUN([AC_NETATALK_DBUS_GLIB], [ atalk_cv_with_dbus=no PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1, have_dbus=yes, have_dbus=no) - PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0 >= 2.6, have_dbus_glib=yes, have_dbus_glib=no) + PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1, have_dbus_glib=yes, have_dbus_glib=no) PKG_CHECK_MODULES(DBUS_GTHREAD, gthread-2.0, have_dbus_gthread=yes, have_dbus_gthread=no) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -46,7 +46,13 @@ AC_DEFUN([AC_NETATALK_DBUS_GLIB], [ AC_SUBST(DBUS_GTHREAD_CFLAGS) AC_SUBST(DBUS_GTHREAD_LIBS) if test x$have_dbus_glib = xyes -a x$have_dbus = xyes -a x$have_dbus_gthread = xyes ; then - atalk_cv_with_dbus=yes + saved_CFLAGS=$CFLAGS + saved_LIBS=$LIBS + CFLAGS="$CFLAGS $DBUS_GLIB_CFLAGS" + LIBS="$LIBS $DBUS_GLIB_LIBS" + AC_CHECK_FUNC([dbus_g_bus_get_private], [atalk_cv_with_dbus=yes], [atalk_cv_with_dbus=no]) + CFLAGS="$saved_CFLAGS" + LIBS="$saved_LIBS" fi AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$atalk_cv_with_dbus = xyes)