X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fsummary.m4;h=8d9abc50fc0e0901a7b5bcf4e52fac82a4cc7524;hb=d4fdc0119a3fd21571e27aad6c3e6ff5c56ac880;hp=744c4f2b7f8e05aade37cece7e06728fbbd0a49d;hpb=85d268c10175d1e8050188a3a4797b40519a285e;p=netatalk.git

diff --git a/macros/summary.m4 b/macros/summary.m4
index 744c4f2b..8d9abc50 100644
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -1,12 +1,11 @@
-dnl $Id: summary.m4,v 1.6 2009-10-02 09:32:41 franklahm Exp $
 dnl Autoconf macros, display configure summary
 
 AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
 
 	AC_MSG_RESULT([Configure summary:])
-	AC_MSG_RESULT([    Install style:])
-	if test "x$sysv_style" != "x"; then
-		AC_MSG_RESULT([         $sysv_style])
+	AC_MSG_RESULT([    INIT STYLE:])
+	if test "x$init_style" != "x"; then
+		AC_MSG_RESULT([         $init_style])
 	else
 		AC_MSG_RESULT([         none])
 	fi
@@ -30,7 +29,7 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
                 AC_MSG_RESULT([         DHX2    ($uams_using_options)])
         fi
 	if test "x$neta_cv_have_openssl" = "xyes"; then
-		AC_MSG_RESULT([         RANDNUM ($uams_using_options)])
+		AC_MSG_RESULT([         RANDNUM (afppasswd)])
 	fi
 	if test x"$netatalk_cv_build_krb5_uam" = x"yes"; then
 		AC_MSG_RESULT([         Kerberos V])
@@ -38,10 +37,9 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
 	if test x"$compile_pgp" = x"yes"; then
 		AC_MSG_RESULT([         PGP])
 	fi
-	AC_MSG_RESULT([         passwd  ($uams_using_options)])
+	AC_MSG_RESULT([         clrtxt  ($uams_using_options)])
 	AC_MSG_RESULT([         guest])
 	AC_MSG_RESULT([    Options:])
-	AC_MSG_RESULT([         SLP support:             $netatalk_cv_srvloc])
 	AC_MSG_RESULT([         Zeroconf support:        $netatalk_cv_zeroconf])
 	AC_MSG_RESULT([         tcp wrapper support:     $netatalk_cv_tcpwrap])
 dnl	if test x"$netatalk_cv_linux_sendfile" != x; then
@@ -51,9 +49,10 @@ dnl	fi
 	AC_MSG_RESULT([         admin group support:     $netatalk_cv_admin_group])
 	AC_MSG_RESULT([         valid shell check:       $netatalk_cv_use_shellcheck])
 	AC_MSG_RESULT([         cracklib support:        $netatalk_cv_with_cracklib])
-	AC_MSG_RESULT([         Samba sharemode interop: $neta_cv_have_smbshmd])
+dnl	AC_MSG_RESULT([         Samba sharemode interop: $neta_cv_have_smbshmd])
 	AC_MSG_RESULT([         ACL support:             $with_acl_support])
-	AC_MSG_RESULT([         LDAP support:            $with_ldap])
+	AC_MSG_RESULT([         Kerberos support:        $with_kerberos])
+	AC_MSG_RESULT([         LDAP support:            $netatalk_cv_ldap])
 	if test x"$use_pam_so" = x"yes" -a x"$netatalk_cv_install_pam" = x"no"; then
 		AC_MSG_RESULT([])
 		AC_MSG_WARN([ PAM support was configured for your system, but the netatalk PAM configuration file])
@@ -102,14 +101,26 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [
 		AC_MSG_RESULT([        LIBS   = $GSSAPI_LIBS])
 		AC_MSG_RESULT([        CFLAGS = $GSSAPI_CFLAGS])
 	fi
-	if test x"$netatalk_cv_srvloc" = x"yes"; then
-		AC_MSG_RESULT([    SRVLOC:])
-		AC_MSG_RESULT([        LIBS   = $SLP_LIBS])
-		AC_MSG_RESULT([        CFLAGS = $SLP_CFLAGS])
-	fi
 	if test x"$netatalk_cv_use_cups" = x"yes"; then
 		AC_MSG_RESULT([    CUPS:])
 		AC_MSG_RESULT([        LIBS   = $CUPS_LIBS])
 		AC_MSG_RESULT([        CFLAGS = $CUPS_CFLAGS])
 	fi
+	if test x"$netatalk_cv_zeroconf" = x"yes"; then
+		AC_MSG_RESULT([    ZEROCONF:])
+		AC_MSG_RESULT([        LIBS   = $ZEROCONF_LIBS])
+		AC_MSG_RESULT([        CFLAGS = $ZEROCONF_CFLAGS])
+	fi
+	if test x"$netatalk_cv_ldap" = x"yes"; then
+		AC_MSG_RESULT([    LDAP:])
+		AC_MSG_RESULT([        LIBS   = $LDAP_LDLFLAGS $LDAP_LIBS])
+		AC_MSG_RESULT([        CFLAGS = $LDAP_CFLAGS])
+	fi
+    AC_MSG_RESULT([    LIBEVENT:])
+    if test x"$use_bundled_libevent" = x"yes"; then
+		AC_MSG_RESULT([        bundled])
+    else
+		AC_MSG_RESULT([        LIBS   = $LIBEVENT_CFLAGS])
+		AC_MSG_RESULT([        CFLAGS = $LIBEVENT_LDFLAGS])
+    fi
 ])