more autoconf simplifications.

[apps/madmutt.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9867df4..9431e6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -339,8 +339,6 @@ AC_ARG_ENABLE(nntp, AC_HELP_STRING([--enable-nntp],[Enable NNTP support]),[
 ])
 AM_CONDITIONAL(BUILD_NNTP, test x$need_nntp = xyes)
 
-dnl -- end socket dependencies --
-
 AC_MSG_CHECKING([for socklen_t])
 AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
         AC_MSG_RESULT([no])
@@ -351,30 +349,21 @@ AC_CHECK_FUNCS(getaddrinfo)
 
 dnl -- imap dependencies --
 
-AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss[=PFX]], [Compile in GSSAPI authentication for IMAP]),
-    gss_prefix="$withval", gss_prefix="no")
-if test "$gss_prefix" != "no"
-then
-    MUTT_AM_PATH_GSSAPI(gss_prefix)
-    AC_MSG_CHECKING(GSSAPI implementation)
-    AC_MSG_RESULT($GSSAPI_IMPL)
-    if test "$GSSAPI_IMPL" = "none"
-    then
-      AC_CACHE_SAVE
-      AC_MSG_RESULT([GSSAPI libraries not found])
-    fi
-    if test "$GSSAPI_IMPL" = "Heimdal"
-    then
-      AC_DEFINE(HAVE_HEIMDAL,1,[ Define if your GSSAPI implementation is Heimdal ])
+AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss], [Compile in GSSAPI authentication for IMAP]),[
+    if test x$with_gss != xno; then
+        PKG_CHECK_MODULES(GSSAPI,libgssapi,[
+            CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+            MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS"
+            AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ])
+            AM_CONDITIONAL(USE_GSS, true)
+        ],[
+           AC_MSG_RESULT([could not find libgssapi])
+           AM_CONDITIONAL(USE_GSS, false)
+        ])
+    else
+       AM_CONDITIONAL(USE_GSS, false)
     fi
-    CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
-    MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS"
-    AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ])
-    need_gss="yes"
-fi
-AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes)
-
-dnl -- end imap dependencies --
+])
 
 AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP]),
 [   if test "$with_ssl" != "no"; then
@@ -435,7 +424,7 @@ AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]],
 ])
 AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes)
 
-AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]),[
+AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn], [Use GNU libidn for domain names]),[
     if test x$with_idn != xno ; then
         PKG_CHECK_MODULES(IDN,libidn,[
             if $PKG_CONFIG --atleast-version=0.6; then