prepare the ssl module.

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

diff --git a/init.h b/init.h
index 9bb31f1..ddddcb8 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1044,7 +1044,7 @@ struct option_t MuttVars[] = {
    ** maximum line length is determined by the terminal width and $$wrapmargin.
    */
 #ifdef USE_HCACHE
    ** maximum line length is determined by the terminal width and $$wrapmargin.
    */
 #ifdef USE_HCACHE

-  {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" },
+  {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "~/.cache/madmutt/" },

   /*
    ** .pp
    ** Availability: Header Cache
   /*
    ** .pp
    ** Availability: Header Cache


@@ -1772,7 +1772,7 @@ struct option_t MuttVars[] = {
    ** advertising the capability. When \fIunset\fP, Madmutt will not attempt to
    ** use STARTTLS regardless of the server's capabilities.
    */
    ** advertising the capability. When \fIunset\fP, Madmutt will not attempt to
    ** use STARTTLS regardless of the server's capabilities.
    */

-  {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, "~/.mutt_certificates"},
+  {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, "~/.cache/madmutt/certificates"},

   /*
    ** .pp
    ** Availability: SSL or GNUTLS
   /*
    ** .pp
    ** Availability: SSL or GNUTLS

diff --git a/lib-sys/Makefile.am b/lib-sys/Makefile.am
index 7a2787d..333a6a7 100644 (file)
--- a/lib-sys/Makefile.am
+++ b/lib-sys/Makefile.am
@@ -2,11 +2,11 @@ noinst_LIBRARIES = libsys.a
 
 libsys_a_SOURCES = exit.h unix.h mutt_signal.h \
                   exit.c unix.c mutt_signal.c filter.c \
 
 libsys_a_SOURCES = exit.h unix.h mutt_signal.h \
                   exit.c unix.c mutt_signal.c filter.c \

-                  $(___networking_part____) \

                   mutt_socket.h mutt_tunnel.c \
                   mutt_socket.h mutt_tunnel.c \

-                  mutt_socket.c mutt_tunnel.h mutt_ssl_gnutls.c
+                  mutt_socket.c mutt_tunnel.h mutt_ssl.c

 
 noinst_HEADERS   = exit.h unix.h \
                   mutt_socket.h mutt_tunnel.c
 
 
 noinst_HEADERS   = exit.h unix.h \
                   mutt_socket.h mutt_tunnel.c
 

+include $(top_builddir)/tools/cpkg2c.mk

 -include $(top_builddir)/tools/cflags.mk
 -include $(top_builddir)/tools/cflags.mk

diff --git a/lib-sys/mutt_socket.h b/lib-sys/mutt_socket.h
index 781427d..1119b02 100644 (file)
--- a/lib-sys/mutt_socket.h
+++ b/lib-sys/mutt_socket.h
@@ -12,7 +12,7 @@
 #define _MUTT_SOCKET_H_ 1
 
 #include "account.h"
 #define _MUTT_SOCKET_H_ 1
 
 #include "account.h"

-#include "mutt.h"
+#include "mutt_ssl.li"

 
 /* logging levels */
 #define M_SOCK_LOG_CMD  2
 
 /* logging levels */
 #define M_SOCK_LOG_CMD  2

diff --git a/lib-sys/mutt_ssl_gnutls.c b/lib-sys/mutt_ssl.cpkg
similarity index 100%
rename from lib-sys/mutt_ssl_gnutls.c
rename to lib-sys/mutt_ssl.cpkg

diff --git a/tools/Makefile b/tools/Makefile
index b954231..6b5625a 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,6 +3,7 @@ all: ../lib-mime/mime-token.h \
      ../lib-mime/mime.li      \
      ../lib-lua/lua-token.h   \
      ../lib-lua/madmutt.li    \
      ../lib-mime/mime.li      \
      ../lib-lua/lua-token.h   \
      ../lib-lua/madmutt.li    \

+     ../lib-sys/mutt_ssl.li   \

      ../alias.li              \
      ../buffy.li              \
      ../charset.li
      ../alias.li              \
      ../buffy.li              \
      ../charset.li