X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=2a889f470365e5d37f1060b84b7b12fbf61b3828;hp=c22908029cd17f44c9c092ef9a46dffe38ce6042;hb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e;hpb=201fd8633cc86ccda413c919ae6e2ae04e89b4a9

diff --git a/configure.ac b/configure.ac
index c229080..2a889f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -406,27 +406,23 @@ 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
-          if test "$with_ssl" != "yes"
-          then
-           LDFLAGS="$LDFLAGS -L$withval/lib"
-           CPPFLAGS="$CPPFLAGS -I$withval/include"
-          fi
-          saved_LIBS="$LIBS"
-
-          AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library]))
-          AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto)
+[   if test "$with_ssl" != "no"; then
+        if test "$with_ssl" != "yes"; then
+            LDFLAGS="$LDFLAGS -L$withval/lib"
+            CPPFLAGS="$CPPFLAGS -I$withval/include"
+        fi
+        saved_LIBS="$LIBS"
 
-          AC_CHECK_FUNCS(RAND_status RAND_egd)
+        AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library]))
+        AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto)
 
-          AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
-          LIBS="$saved_LIBS"
-          MUTTLIBS="$MUTTLIBS -lssl -lcrypto"
-          MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl.o"
-          need_ssl=yes
+        AC_CHECK_FUNCS(RAND_status RAND_egd)
 
-        fi
+        AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
+        LIBS="$saved_LIBS"
+        MUTTLIBS="$MUTTLIBS -lssl -lcrypto"
+        need_ssl=yes
+    fi
 ])
 
 AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls], [Enable SSL support using gnutls]),
@@ -439,12 +435,12 @@ if test "$gnutls_prefix" != "no"; then
         CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
         MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
         AC_DEFINE(USE_GNUTLS, 1, [Define if you want support for SSL via the gnutls library.])
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o"
         need_ssl=yes],
         [AC_MSG_ERROR([could not find libgnutls])
     ])
 fi
 AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
+AC_SUBST(MUTT_SSL_OBJECTS)
 
 AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]],
             [Use Cyrus SASL library version 2 for POP/IMAP authentication]),[
@@ -456,8 +452,7 @@ AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]],
 
         saved_LIBS="$LIBS"
 
-        AC_CHECK_LIB(sasl2, sasl_client_init,,
-                     AC_MSG_ERROR([could not find libsasl2]),)
+        AC_CHECK_LIB(sasl2, sasl_client_init,,AC_MSG_ERROR([could not find libsasl2]))
 
         MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o"
         MUTTLIBS="$MUTTLIBS -lsasl2"
@@ -912,6 +907,7 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         lib-mime/Makefile
         lib-crypt/Makefile
         lib-hash/Makefile
+        lib-network/Makefile
         lib-ui/Makefile
         lib/Makefile
         imap/Makefile