always build pgp support.

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

diff --git a/Makefile.am b/Makefile.am
index 9c3ba5d..5fb8853 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ bin_SCRIPTS = muttngbug fleang
 
 BUILT_SOURCES = keymap_defs.h version.h
 
-bin_PROGRAMS = muttng muttng_dotlock @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
+bin_PROGRAMS = muttng muttng_dotlock pgpringng pgpewrapng @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \
        alias.c attach.c base64.c browser.c buffy.c \
        charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
@@ -35,13 +35,14 @@ muttng_SOURCES = $(BUILT_SOURCES) \
        handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
        init.c keymap.c lib.c \
        main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
-       pager.c parse.c pattern.c postpone.c \
-       query.c \
+       pager.c parse.c pattern.c postpone.c query.c \
        recvattach.c recvcmd.c rfc1524.c rfc3676.c \
        score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
-       thread.c \
-       url.c utf8.c \
-       wcwidth.c
+       thread.c url.c utf8.c wcwidth.c \
+       \
+       pgp.c pgpinvoke.c pgpkey.c pgplib.c gnupgparse.c pgpmicalg.c pgppacket.c \
+       crypt-mod-pgp-classic.c
+
 
 muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
        -Llib-lib -llib -Llib-mime -lmime -Llib-hash -lhash -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)

diff --git a/configure.ac b/configure.ac
index cd48fad..f9ee0ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -130,19 +130,6 @@ dnl ---------------- gpgme ----------------
 
 dnl ---------------- pgp/smime ----------------
 
-    AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]),
-    [   if test x$enableval = xno ; then
-            have_pgp=no
-        fi
-    ])
-
-    if test x$have_pgp != xno ; then
-        AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1,
-            [ Define if you want classic PGP support. ])
-        PGPAUX_TARGET="pgpringng\$(EXEEXT) pgpewrapng\$(EXEEXT)"
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o"
-    fi
-
     AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]),
     [  if test x$enableval = xno ; then
             have_smime=no
@@ -174,7 +161,6 @@ OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT "
 AC_SUBST([OPS])
 
 
-AC_SUBST(PGPAUX_TARGET)
 AC_SUBST(SMIMEAUX_TARGET)
 
 AC_PATH_PROG(ISPELL, ispell, no)

diff --git a/init.h b/init.h
index e510b4e..072618d 100644 (file)
--- a/init.h
+++ b/init.h
@@ -3897,9 +3897,6 @@ static const char* Features[] = {
 #ifdef HAVE_COLOR
   "color",
 #endif
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-  "classic_pgp",
-#endif
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
   "class_smime",
 #endif

diff --git a/main.c b/main.c
index 13749ce..7b266f9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -402,11 +402,6 @@ static void show_version (void)
     );
 
   puts (
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-         "  +CRYPT_BACKEND_CLASSIC_PGP  "
-#else
-         "  -CRYPT_BACKEND_CLASSIC_PGP  "
-#endif
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
          "+CRYPT_BACKEND_CLASSIC_SMIME  "
 #else

diff --git a/mutt_crypt.h b/mutt_crypt.h
index e9713f4..19b28c6 100644 (file)
--- a/mutt_crypt.h
+++ b/mutt_crypt.h
@@ -57,14 +57,10 @@
    effectively as a conditional compile directive. It is set to false
    if no crypto backend is configures or to a bit vector denoting the
    configured backends. */
-#if (defined(CRYPT_BACKEND_CLASSIC_PGP) && defined(CRYPT_BACKEND_CLASSIC_SMIME)) || defined (CRYPT_BACKEND_GPGME)
+#if defined(CRYPT_BACKEND_CLASSIC_SMIME) || defined (CRYPT_BACKEND_GPGME)
 # define WithCrypto (APPLICATION_PGP | APPLICATION_SMIME)
-#elif defined(CRYPT_BACKEND_CLASSIC_PGP)
-# define WithCrypto  APPLICATION_PGP
-#elif defined(CRYPT_BACKEND_CLASSIC_SMIME)
-# define WithCrypto  APPLICATION_SMIME
 #else
-# define WithCrypto 0
+# define WithCrypto  APPLICATION_PGP
 #endif
 
 

diff --git a/pgp.c b/pgp.c
index a17b481..a969176 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -59,8 +59,6 @@
 # include <sys/resource.h>
 #endif
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 #include "mutt_crypt.h"
 #include "mutt_menu.h"
 
@@ -1563,6 +1561,3 @@ int pgp_send_menu (HEADER * msg, int *redraw)
 
   return (msg->security);
 }
-
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */

diff --git a/pgp.h b/pgp.h
index 55b1db3..26bdbb0 100644 (file)
--- a/pgp.h
+++ b/pgp.h
@@ -9,8 +9,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 #include "mutt_crypt.h"
 #include "pgplib.h"
 
@@ -92,5 +90,3 @@ BODY *pgp_encrypt_message (BODY *, char *, int);
 BODY *pgp_sign_message (BODY *);
 
 int pgp_send_menu (HEADER * msg, int *redraw);
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */

diff --git a/pgpkey.c b/pgpkey.c
index ecd789e..b31676a 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -40,8 +40,6 @@
 
 #include <locale.h>
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 struct pgp_cache {
   char *what;
   char *dflt;
@@ -966,6 +964,3 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
   return NULL;
 }
 
-
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */

diff --git a/pgplib.h b/pgplib.h
index e63ba74..a5f5362 100644 (file)
--- a/pgplib.h
+++ b/pgplib.h
@@ -8,11 +8,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 #include "mutt_crypt.h"
 
-
 typedef struct pgp_signature {
   struct pgp_signature *next;
   unsigned char sigtype;
@@ -72,5 +69,3 @@ short pgp_get_abilities (unsigned char);
 void pgp_free_key (pgp_key_t * kpp);
 
 #define pgp_new_keyinfo() xmalloc(sizeof *((pgp_key_t)0))
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */