From: Frank Lahm <franklahm@googlemail.com>
Date: Fri, 22 Feb 2013 09:53:55 +0000 (+0100)
Subject: Add a distinct variable for storing result of checks
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=2a15eb027015d72b88434c862432e932c853c44b

Add a distinct variable for storing result of checks
---

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 70ada56c..f26f2d9e 100644
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -35,6 +35,7 @@ AC_DEFUN([AC_NETATALK_DTRACE], [
 
 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_GTHREAD, gthread-2.0, have_dbus_gthread=yes, have_dbus_gthread=no)
@@ -44,7 +45,10 @@ AC_DEFUN([AC_NETATALK_DBUS_GLIB], [
     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)
+    if test test x$have_dbus_glib = xyes -a x$have_dbus = xyes -a x$have_dbus_gthread = xyes ; then
+        atalk_cv_with_dbus=yes
+    fi
+    AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$atalk_cv_with_dbus = xyes)
 
     AC_ARG_WITH(
         dbus-sysconf-dir,
@@ -53,7 +57,7 @@ AC_DEFUN([AC_NETATALK_DBUS_GLIB], [
         ac_cv_dbus_sysdir='${sysconfdir}/dbus-1/system.d'
     )
 
-    if test x$have_dbus_glib = xyes -a x$have_dbus = xyes ; then
+    if test x$atalk_cv_with_dbus = xyes ; then
         AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define if support for dbus-glib was found])
         DBUS_SYS_DIR="$ac_cv_dbus_sysdir"
         AC_SUBST(DBUS_SYS_DIR)
diff --git a/macros/summary.m4 b/macros/summary.m4
index 2b682a46..59abd693 100644
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -55,7 +55,7 @@ dnl	AC_MSG_RESULT([         Samba sharemode interop: $neta_cv_have_smbshmd])
 	AC_MSG_RESULT([         ACL support:             $with_acl_support])
 	AC_MSG_RESULT([         Kerberos support:        $with_kerberos])
 	AC_MSG_RESULT([         LDAP support:            $netatalk_cv_ldap])
-	AC_MSG_RESULT([         dbus support:            $have_dbus_glib])
+	AC_MSG_RESULT([         dbus support:            $atalk_cv_with_dbus])
 	AC_MSG_RESULT([         dbus system directory:   $ac_cv_dbus_sysdir])
 	AC_MSG_RESULT([         dtrace probes:           $WDTRACE])
 	if test x"$use_pam_so" = x"yes" -a x"$netatalk_cv_install_pam" = x"no"; then