move the last crypt-* things into lib-crypt, adapt configure.ac

accordingly

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

diff --git a/Makefile.am b/Makefile.am
index dabf1f9..565cb8a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,7 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        _regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
        mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h madmuttrc.head madmuttrc \
        makedoc.c stamp-doc-rc README.SSL smime.h\
-       depcomp mutt_idna.h regex.c mutt_libesmtp.h crypt-gpgme.h
+       depcomp mutt_idna.h regex.c mutt_libesmtp.h
 
 madmutt_dotlock_SOURCES = dotlock.c
 madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@

diff --git a/configure.ac b/configure.ac
index 47624b5..37e9202 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,10 @@ AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[
     if test x$enableval = xyes; then
         AM_PATH_GPGME(,,[AC_MSG_ERROR(GPGME not found)])
         MUTTLIBS="$MUTTLIBS $GPGME_LIBS"
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
         AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
+        AM_CONDITIONAL(BUILD_GPGME, true)
+    else
+        AM_CONDITIONAL(BUILD_GPGME, false)
     fi
 ])
 

diff --git a/lib-crypt/Makefile.am b/lib-crypt/Makefile.am
index c6d4ef8..5dfc49b 100644 (file)
--- a/lib-crypt/Makefile.am
+++ b/lib-crypt/Makefile.am
@@ -1,10 +1,17 @@
 noinst_LIBRARIES = libcrypt.a
 
+if BUILD_GPGME
+GPGME_THINGS = crypt-gpgme.h crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c
+endif
+
+
 libcrypt_a_SOURCES = pgp.h pgplib.h pgppacket.h smime.h crypt.h crypt-mod.h \
                     pgp.c pgplib.c pgppacket.c smime.c crypt.c crypt-mod.c \
                     gnupgparse.c pgpinvoke.c pgpkey.c pgpmicalg.c \
-                    cryptglue.c crypt-mod-pgp-classic.c crypt-mod-smime-classic.c
+                    cryptglue.c crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
+                    $(GPGME_THINGS)
 
-noinst_HEADERS     =  pgp.h pgplib.h pgppacket.h smime.h crypt.h crypt-mod.h
+noinst_HEADERS     =  pgp.h pgplib.h pgppacket.h smime.h crypt.h crypt-mod.h \
+                     crypt-gpgme.h
 
 -include ../cflags.mk

diff --git a/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
similarity index 100%
rename from crypt-gpgme.c
rename to lib-crypt/crypt-gpgme.c

diff --git a/crypt-gpgme.h b/lib-crypt/crypt-gpgme.h
similarity index 100%
rename from crypt-gpgme.h
rename to lib-crypt/crypt-gpgme.h

diff --git a/crypt-mod-pgp-gpgme.c b/lib-crypt/crypt-mod-pgp-gpgme.c
similarity index 100%
rename from crypt-mod-pgp-gpgme.c
rename to lib-crypt/crypt-mod-pgp-gpgme.c

diff --git a/crypt-mod-smime-gpgme.c b/lib-crypt/crypt-mod-smime-gpgme.c
similarity index 100%
rename from crypt-mod-smime-gpgme.c
rename to lib-crypt/crypt-mod-smime-gpgme.c