Remove timeout. See bug #2683367

[netatalk.git] / macros / summary.m4

diff --git a/macros/summary.m4 b/macros/summary.m4
index 24220755aa9b3d1f87ade749834424b10d5f8836..bb0a32a17bc9d205c98380e0affd66e606cc792d 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -1,8 +1,15 @@
-AC_DEFUN([AM_NETATALK_CONFIG_SUMMARY], [
+dnl $Id: summary.m4,v 1.1.2.5.2.2 2008-12-02 03:11:59 didg Exp $
+dnl Autoconf macros, display configure summary
+
+AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
 
        AC_MSG_RESULT([Configure summary:])
        AC_MSG_RESULT([    Install style:])
-       AC_MSG_RESULT([         $sysv_style])
+       if test "x$sysv_style" != "x"; then
+               AC_MSG_RESULT([         $sysv_style])
+       else
+               AC_MSG_RESULT([         none])
+       fi
        AC_MSG_RESULT([    AFP:])
        AC_MSG_RESULT([         AFP 3.x calls activated: $afp3])
        if test "x$afp3" = "xyes"; then
@@ -19,8 +26,13 @@ AC_DEFUN([AM_NETATALK_CONFIG_SUMMARY], [
        if test "x$netatalk_cv_use_shadowpw" = "xyes"; then
                uams_using_options="$uams_using_options SHADOW"
        fi
-       if test "x$compile_ssl" = "xyes"; then
+       if test "x$neta_cv_compile_dhx" = "xyes"; then
                AC_MSG_RESULT([         DHX     ($uams_using_options)])
+       fi
+        if test "x$neta_cv_compile_dhx2" = "xyes"; then
+                AC_MSG_RESULT([         DHX2    ($uams_using_options)])
+        fi
+       if test "x$neta_cv_have_openssl" = "xyes"; then
                AC_MSG_RESULT([         RANDNUM ($uams_using_options)])
        fi
        if test x"$netatalk_cv_build_krb5_uam" = x"yes"; then
@@ -35,11 +47,13 @@ AC_DEFUN([AM_NETATALK_CONFIG_SUMMARY], [
        AC_MSG_RESULT([         passwd  ($uams_using_options)])
        AC_MSG_RESULT([         guest])
        AC_MSG_RESULT([    Options:])
+       AC_MSG_RESULT([         CUPS support:           $netatalk_cv_use_cups])
        AC_MSG_RESULT([         SLP support:            $netatalk_cv_srvloc])
        AC_MSG_RESULT([         tcp wrapper support:    $netatalk_cv_tcpwrap])
-       if test x"$netatalk_cv_linux_sendfile" != x; then
-               AC_MSG_RESULT([         Linux sendfile support: $netatalk_cv_linux_sendfile])
-       fi
+dnl    if test x"$netatalk_cv_linux_sendfile" != x; then
+dnl            AC_MSG_RESULT([         Linux sendfile support: $netatalk_cv_linux_sendfile])
+dnl    fi
+       AC_MSG_RESULT([         quota support:          $netatalk_cv_quotasupport])
        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])
@@ -50,25 +64,30 @@ AC_DEFUN([AM_NETATALK_CONFIG_SUMMARY], [
                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 you'll have to edit /etc/pam.conf to get PAM working.])
+               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
 
 ])
 
 
-AC_DEFUN([AM_NETATALK_LIBS_SUMMARY], [
+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([    CFLAGS = $CFLAGS])
-       if test x"$compile_ssl" = x"yes"; then
+       if test x"$neta_cv_have_openssl" = x"yes"; then
                AC_MSG_RESULT([    SSL:])
                AC_MSG_RESULT([        LIBS   = $SSL_LIBS])
                AC_MSG_RESULT([        CFLAGS = $SSL_CFLAGS])
        fi
+        if test x"$neta_cv_have_libgcrypt" = x"yes"; then
+                AC_MSG_RESULT([    LIBGCRYPT:])
+                AC_MSG_RESULT([        LIBS   = $LIBGCRYPT_LIBS])
+                AC_MSG_RESULT([        CFLAGS = $LIBGCRYPT_CFLAGS])
+        fi
        if test x"$netatalk_cv_use_pam" = x"yes"; then
                AC_MSG_RESULT([    PAM:])
                AC_MSG_RESULT([        LIBS   = $PAM_LIBS])
@@ -94,4 +113,9 @@ AC_DEFUN([AM_NETATALK_LIBS_SUMMARY], [
                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
 ])