configure fixes.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/configure.ac b/configure.ac
index 7bc00b3..794c780 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -355,13 +355,10 @@ AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss], [Compile in GSSAPI authentication
             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_CHECK_HEADERS(xom.h)
         ],[
-           AC_MSG_RESULT([could not find libgssapi])
-           AM_CONDITIONAL(USE_GSS, false)
+           AC_MSG_ERROR([could not find libgssapi])
         ])
-    else
-       AM_CONDITIONAL(USE_GSS, false)
     fi
 ])
 
@@ -634,9 +631,7 @@ fi # libiconv
 
 dnl -- locales --
 
-AC_CHECK_HEADERS(locale.h)
-AC_CHECK_HEADERS(wchar.h)
-AC_CHECK_HEADERS(wctype.h)
+AC_CHECK_HEADERS(locale.h wchar.h wctype.h)
 AC_CHECK_FUNCS(iswalnum iswalpha  iswcntrl iswdigit)
 AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper)
 AC_CHECK_FUNCS(iswxdigit towupper towlower)

diff --git a/imap/Makefile.am b/imap/Makefile.am
index 4dbf7db..dda0b6a 100644 (file)
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -1,13 +1,3 @@
-## Process this file with automake to produce Makefile.in
-
-AR=@AR@
-
-AUTOMAKE_OPTIONS = foreign
-
-if USE_GSS
-GSSSOURCES = auth_gss.c
-endif
-
 if USE_SASL
 AUTHENTICATORS = auth_sasl.c
 else
@@ -22,6 +12,6 @@ noinst_LIBRARIES = libimap.a
 noinst_HEADERS = auth.h imap_private.h message.h mx_imap.h
 
 libimap_a_SOURCES = auth.c auth_login.c browse.c command.c imap.c imap.h mx_imap.h \
-       message.c utf7.c util.c mx_imap.c $(AUTHENTICATORS) $(GSSSOURCES)
+       message.c utf7.c util.c mx_imap.c $(AUTHENTICATORS) auth_gss.c
 
 -include ../cflags.mk

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 8fe099c..a014a02 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -13,9 +13,7 @@
 # include "config.h"
 #endif
 
-#include "mutt.h"
-#include "imap_private.h"
-#include "auth.h"
+#ifdef USE_GSS
 
 #include <lib-lib/macros.h>
 
@@ -35,6 +33,10 @@
 #define GSS_AUTH_P_INTEGRITY 2
 #define GSS_AUTH_P_PRIVACY   4
 
+#include "mutt.h"
+#include "imap_private.h"
+#include "auth.h"
+
 /* imap_auth_gss: AUTH=GSSAPI support. */
 imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method __attribute__ ((unused)))
 {
@@ -223,3 +225,5 @@ bail:
   mutt_sleep (2);
   return IMAP_AUTH_FAILURE;
 }
+
+#endif /* USE_GSS */