Added warning to differs.

[~andy/fetchmail] / configure.in

diff --git a/configure.in b/configure.in
index a32e67ceb7d31ba3880c0a7cc3f5847a73c0d831..1aff940bdf35e1b923bda4b8a2cf374059eb1dba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -72,7 +72,7 @@ fi
 # Arnaldo Carvalho de Melo <acme@conectiva.com.br>
 # Sat Nov  7 15:39:03 EDT 1998
 
-ALL_LINGUAS="cs es fr pl pt_BR ru"
+ALL_LINGUAS="cs es fr pl pt_BR"
 
 AM_GNU_GETTEXT
 
@@ -118,6 +118,10 @@ AC_CHECK_FUNC(getopt_long, AC_DEFINE(HAVE_GETOPTLONG),
               [EXTRASRC="$EXTRASRC \$(srcdir)/getopt.c \$(srcdir)/getopt1.c"
                EXTRAOBJ="$EXTRAOBJ getopt.o getopt1.o"])
 
+AC_CHECK_FUNC(MD5Init, AC_DEFINE(HAVE_MD5),
+              [EXTRASRC="$EXTRASRC \$(srcdir)/md5c.c"
+               EXTRAOBJ="$EXTRAOBJ md5c.o"])
+
 AC_FUNC_VPRINTF
 AC_FUNC_ALLOCA
 if test -n "$ALLOCA" 
@@ -287,15 +291,19 @@ test "$with_opie" = "yes" && AC_DEFINE(OPIE_ENABLE)
 
 AC_ARG_ENABLE(inet6,
        [  --enable-inet6          support IPv6 (requires the inet6-apps library)],
-        [ unset ac_cv_lib_inet6_getaddrinfo; AC_CHECK_LIB(inet6,getaddrinfo,,
-         [ unset ac_cv_lib_inet6_getaddrinfo;
-           LDFLAGS="$LDFLAGS -L/usr/inet6/lib";
-            AC_CHECK_LIB(inet6, getaddrinfo,,
-              [ echo 'configure: cannot find libinet6, which is required for IPv6 support.'; 
-             exit 1]) ]) ]
+
+       [ AC_CHECK_FUNC(getaddrinfo, [with_inet6=yes],
+         [ LDFLAGS="$LDFLAGS -L/usr/inet6/lib";
+           AC_CHECK_LIB(inet6, getaddrinfo, [with_inet6=yes
+           LIBS="$LIBS -linet6"],
+           [ echo 'configure: cannot find proper glibc version or libinet6,';
+             echo '           which is required for IPv6 support.';
+             exit 1]) ] )],
        [with_inet6=no])
 test "$with_inet6" = "yes" && AC_DEFINE(INET6_ENABLE)
 
+AC_CHECK_FUNCS(inner_connect)
+
 AC_ARG_ENABLE(netsec,
        [  --enable-netsec         support network security (requires inet6-apps library)],
         [ unset ac_cv_lib_inet6_net_security_strtorequest; AC_CHECK_LIB(inet6, net_security_strtorequest,,
@@ -358,10 +366,10 @@ fi
 
 ###    use option --with-ssl to compile in the SSL support
 AC_ARG_WITH(ssl,
-       [  --with-ssl[=DIR]        enable SSL support using libraries in DIR]
-       [with_ssl=$enableval],
+       [  --with-ssl=[DIR]        enable SSL support using libraries in DIR],
+       [with_ssl=$withval],
        [with_ssl=no])
-test "$with_netsec" = "yes" && AC_DEFINE(SSL_ENABLE)
+test "$with_ssl" = "yes" && AC_DEFINE(SSL_ENABLE)
 
 if test "$with_ssl" = "yes"
 then
@@ -401,6 +409,11 @@ then
 ###    ssl.h found under openssl.  Use openssl configuration preferentially
         echo "Enabling OpenSSL support in $with_ssl"
         CEFLAGS="$CEFLAGS -I$with_ssl/include -I$with_ssl/include/openssl"
+###    OpenBSD comes with ssl headers
+    elif test -r /usr/include/ssl/ssl.h
+    then
+        echo "Enabling SSLeay support in $with_ssl"
+        CEFLAGS="$CEFLAGS -I/usr/include/ssl"
     else
         echo "Enabling SSLeay support in $with_ssl"
         CEFLAGS="$CEFLAGS -I$with_ssl/include"
@@ -526,10 +539,9 @@ then
     LDFLAGS="$LDFLAGS -L$with_gssapi/lib"
   fi
 
-  AC_CHECK_LIB(krb5, krb5_init_context,,
-               AC_MSG_ERROR([could not find libkrb5 which is needed for GSSAPI support]))
-  if test -f "$with_kerberos5/include/roken.h"
+  if test -f "$with_gssapi/include/roken.h"
   then
+     LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken -ldb -ldl"
      AC_CHECK_LIB(gssapi, gss_init_sec_context,LIBS="$LIBS -lgssapi",
                   AC_MSG_ERROR([could not find libgssapi which is needed for GSSAPI support]), )
      AC_DEFINE(HEIMDAL)
@@ -546,7 +558,6 @@ then
   else
     AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
   fi
-  CPPFLAGS=$save_CPPFLAGS
 fi])
 
 AC_OUTPUT([Makefile intl/Makefile po/Makefile.in], [