Merge remote-tracking branch 'origin/develop' into spotlight

diff --git a/etc/afpd/afpstats.c b/etc/afpd/afpstats.c
index 1dbacdf84abaa551faac1c93f4f59033635e60b4..b50dc33c7887dc62c6c340652298787669a2e659 100644 (file)
--- a/etc/afpd/afpstats.c
+++ b/etc/afpd/afpstats.c
@@ -21,8 +21,8 @@
 #include <string.h>
 #include <errno.h>
 #include <pthread.h>
+
 #include <glib.h>
-#include <gio/gio.h>
 #include <dbus/dbus-glib.h>
 
 #include <atalk/logger.h>

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index ddaa2521408779f1ca88f824ebd241cae05c8b77..731808e4efc352e69a22e74bdc418df5940b3105 100644 (file)
--- 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 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/pam-check.m4 b/macros/pam-check.m4
index 26d14b850482e09331cc1ec46227d32a3e8128f9..609c92dcae18885775afd8b744b1d6a5a73f9b73 100644 (file)
--- a/macros/pam-check.m4
+++ b/macros/pam-check.m4
@@ -140,11 +140,13 @@ AC_DEFUN([AC_NETATALK_PATH_PAM], [
 
     AC_ARG_WITH(
         pam-confdir,
-        [AS_HELP_STRING([--with-pam-confdir=PATH],[Path to PAM config dir (default: $sysconfdir/pam.d)])],
-        PAMDIR=$withval,
-        PAMDIR='${sysconfdir}/pam.d'
+        [AS_HELP_STRING([--with-pam-confdir=PATH],[Path to PAM config dir (default: ${sysconfdir}/pam.d)])],
+        ac_cv_pamdir=$withval,
+        ac_cv_pamdir='${sysconfdir}/pam.d'
     )
 
+    PAMDIR="$ac_cv_pamdir"
+
     LIB_REMOVE_USR_LIB(PAM_LIBS)
     CFLAGS_REMOVE_USR_INCLUDE(PAM_CFLAGS)
        AC_SUBST(PAMDIR)

diff --git a/macros/summary.m4 b/macros/summary.m4
index edb136c2e170a151c25e81617612e3fcd033cb2c..b5093a04b5bd3f80438eb63016df312e43a4ae4a 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -9,8 +9,6 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
        else
                AC_MSG_RESULT([         none])
        fi
-       AC_MSG_RESULT([    Netatalk lockfile:])
-       AC_MSG_RESULT([         $ac_cv_netatalk_lock])
        AC_MSG_RESULT([    AFP:])
        AC_MSG_RESULT([         Extended Attributes: $neta_cv_eas])
        AC_MSG_RESULT([         ACL support: $with_acl_support])
@@ -56,17 +54,24 @@ 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 system directory:   $ac_cv_dbus_sysdir])
+       AC_MSG_RESULT([         dbus support:            $atalk_cv_with_dbus])
        AC_MSG_RESULT([         dtrace probes:           $WDTRACE])
-       if test x"$use_pam_so" = x"yes" -a x"$netatalk_cv_install_pam" = x"no"; then
+       AC_MSG_RESULT([    Paths:])
+       AC_MSG_RESULT([         Netatalk lockfile:       $ac_cv_netatalk_lock])
+       if test x"$atalk_cv_with_dbus" = x"yes"; then
+               AC_MSG_RESULT([         dbus system directory:   $ac_cv_dbus_sysdir])
+       fi
+       if test x"$use_pam_so" = x"yes"; then
+          if test x"$netatalk_cv_install_pam" = x"yes"; then
+               AC_MSG_RESULT([         pam config directory:    $ac_cv_pamdir])
+          else
                AC_MSG_RESULT([])
                AC_MSG_WARN([ PAM support was configured for your system, but the netatalk PAM configuration file])
                AC_MSG_WARN([ cannot be installed. Please install the config/netatalk.pamd file manually.])
                AC_MSG_WARN([ If you're running Solaris or BSD you'll have to edit /etc/pam.conf to get PAM working.])
                AC_MSG_WARN([ You can also re-run configure and specify --without-pam to disable PAM support.])
+          fi
        fi
-
 ])