Remove timeout. See bug #2683367

[netatalk.git] / macros / summary.m4

diff --git a/macros/summary.m4 b/macros/summary.m4
index 4713e710e7de134d9bd90c31404ba95d0e79b539..bb0a32a17bc9d205c98380e0affd66e606cc792d 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -1,11 +1,15 @@
-dnl $Id: summary.m4,v 1.1.2.5 2004-06-24 00:43:58 bfernhomberg Exp $
+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
@@ -22,8 +26,13 @@ AC_DEFUN([AC_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
@@ -69,11 +78,16 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [
        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])