Add checking for and linking with libgthread

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 335f4293e9b6546ab6028da90cac34dc4a3d8280..2e242d957ae43463e96bcaf896ecd5fedf609c29 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -80,8 +80,8 @@ afpstats_service_glue.h: afpstats-service.xml
                        $(top_srcdir)/etc/afpd/afpstats-service.xml
 
 afpd_SOURCES += afpstats.c afpstats_obj.c
-afpd_CFLAGS  += $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPILATION
-afpd_LDFLAGS += $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -ldbus-glib-1
+afpd_CFLAGS  += $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GTHREAD_CFLAGS) -DDBUS_COMPILATION
+afpd_LDFLAGS += $(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(DBUS_GTHREAD_LIBS) -ldbus-glib-1
 endif
 
 if WITH_DTRACE

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 55c6d9e48da1554b0676c1aca5342751c3e36d33..70ada56ce07ca1ace0f85535a74694ac23c55f36 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -37,10 +37,13 @@ dnl Check for dbus-glib, for AFP stats
 AC_DEFUN([AC_NETATALK_DBUS_GLIB], [
     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_GTHREAD, gthread-2.0, have_dbus_gthread=yes, have_dbus_gthread=no)
     AC_SUBST(DBUS_CFLAGS)
     AC_SUBST(DBUS_LIBS)
     AC_SUBST(DBUS_GLIB_CFLAGS)
     AC_SUBST(DBUS_GLIB_LIBS)
+    AC_SUBST(DBUS_GTHREAD_CFLAGS)
+    AC_SUBST(DBUS_GTHREAD_LIBS)
     AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$have_dbus_glib = xyes -a x$have_dbus = xyes)
 
     AC_ARG_WITH(