X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fsummary.m4;h=de8aaa0cb8fa9493a705e134335f03c55c61d612;hb=f254fd618b53e97cc5382b23709d4f3de1e70b41;hp=b5093a04b5bd3f80438eb63016df312e43a4ae4a;hpb=53d18835cae017adc2051868fe5b3063f086edae;p=netatalk.git

diff --git a/macros/summary.m4 b/macros/summary.m4
index b5093a04..de8aaa0c 100644
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -11,7 +11,7 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
 	fi
 	AC_MSG_RESULT([    AFP:])
 	AC_MSG_RESULT([         Extended Attributes: $neta_cv_eas])
-	AC_MSG_RESULT([         ACL support: $with_acl_support])
+	AC_MSG_RESULT([         ACL support: $ac_cv_have_acls])
 	AC_MSG_RESULT([         Spotlight: $ac_cv_have_tracker])
 	AC_MSG_RESULT([    CNID:])
 	AC_MSG_RESULT([         backends: $compiled_backends])
@@ -54,10 +54,13 @@ 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:            $atalk_cv_with_dbus])
+	AC_MSG_RESULT([         AFP stats via dbus:      $atalk_cv_with_dbus])
 	AC_MSG_RESULT([         dtrace probes:           $WDTRACE])
 	AC_MSG_RESULT([    Paths:])
 	AC_MSG_RESULT([         Netatalk lockfile:       $ac_cv_netatalk_lock])
+	if test "x$init_style" != x"none"; then
+		AC_MSG_RESULT([         init directory:          $ac_cv_init_dir])
+	fi
 	if test x"$atalk_cv_with_dbus" = x"yes"; then
 		AC_MSG_RESULT([         dbus system directory:   $ac_cv_dbus_sysdir])
 	fi
@@ -72,6 +75,8 @@ dnl	AC_MSG_RESULT([         Samba sharemode interop: $neta_cv_have_smbshmd])
 		AC_MSG_WARN([ You can also re-run configure and specify --without-pam to disable PAM support.])
 	   fi
 	fi
+	AC_MSG_RESULT([    Documentation:])
+	AC_MSG_RESULT([         Docbook:                 $XSLTPROC_WORKS])
 ])
 
 
@@ -79,12 +84,18 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [
 	dnl #################################################
 	dnl # Display summary of libraries detected
 
-	AC_MSG_RESULT([Using libraries:])
-	AC_MSG_RESULT([    LIBS           = $LIBS])
+	AC_MSG_RESULT([Compilation summary:])
+	AC_MSG_RESULT([    CPPFLAGS       = $CPPFLAGS])
 	AC_MSG_RESULT([    CFLAGS         = $CFLAGS])
+	AC_MSG_RESULT([    LIBS           = $LIBS])
 	AC_MSG_RESULT([    PTHREADS:])
 	AC_MSG_RESULT([        LIBS   = $PTHREAD_LIBS])
 	AC_MSG_RESULT([        CFLAGS = $PTHREAD_CFLAGS])
+	if test x"$ac_cv_have_tracker" = x"yes"; then
+		AC_MSG_RESULT([    TRACKER:])
+		AC_MSG_RESULT([        LIBS   = $TRACKER_LIBS])
+		AC_MSG_RESULT([        CFLAGS = $TRACKER_CFLAGS])
+	fi
 	if test x"$neta_cv_have_openssl" = x"yes"; then
 		AC_MSG_RESULT([    SSL:])
 		AC_MSG_RESULT([        LIBS   = $SSL_LIBS])
@@ -127,7 +138,7 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [
 	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([        LIBS   = $LDAP_LDFLAGS $LDAP_LIBS])
 		AC_MSG_RESULT([        CFLAGS = $LDAP_CFLAGS])
 	fi
     AC_MSG_RESULT([    LIBEVENT:])
@@ -137,4 +148,16 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [
 		AC_MSG_RESULT([        LIBS   = $LIBEVENT_CFLAGS])
 		AC_MSG_RESULT([        CFLAGS = $LIBEVENT_LDFLAGS])
     fi
+    AC_MSG_RESULT([    TDB:])
+    if test x"$use_bundled_tdb" = x"yes"; then
+		AC_MSG_RESULT([        bundled])
+    else
+		AC_MSG_RESULT([        LIBS   = $TDB_LIBS])
+		AC_MSG_RESULT([        CFLAGS = $TDB_CFLAGS])
+    fi
+	if test x"$ac_cv_with_cnid_mysql" = x"yes"; then
+		AC_MSG_RESULT([    MySQL:])
+		AC_MSG_RESULT([        LIBS   = $MYSQL_LIBS])
+		AC_MSG_RESULT([        CFLAGS = $MYSQL_CFLAGS])
+	fi
 ])