configure summary show paths

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 59abd6937f128765701696baed6287125dbcf094..7f5e649991a0da5fe80f486f12383980ad3ee33c 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,16 +54,23 @@ dnl AC_MSG_RESULT([         Samba sharemode interop: $neta_cv_have_smbshmd])
        AC_MSG_RESULT([         Kerberos support:        $with_kerberos])
        AC_MSG_RESULT([         LDAP support:            $netatalk_cv_ldap])
        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
+       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
-
 ])