Handle systems which have neither pgp2 nor pgp5, but gpg correctly.

diff --git a/configure b/configure
index daa5da71a4dc518a4217694bd7f87453dba6a6d5..59eeeef28a7440c05c10c794e81bfc2653c0804c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1327,7 +1327,7 @@ EOF
 
        fi
 
-       if test $PGP != no || test $PGPK != no ; then
+       if test $PGP != no || test $PGPK != no || test $GPG != no ; then
                MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgppubring.o sha1dgst.o gnupgparse.o"
                OPS="$OPS \$(srcdir)/OPS.PGP"
        fi

diff --git a/configure.in b/configure.in
index ba8aa18ee160e894157a76d392ce7794e2145732..62875e7452882db77d7adba4096fce30d597b4fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -66,7 +66,7 @@ else
                AC_DEFINE_UNQUOTED(_PGPPATH, "$PGPPATH")
        fi
 
-       if test $PGP != no || test $PGPK != no ; then
+       if test $PGP != no || test $PGPK != no || test $GPG != no ; then
                MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgppubring.o sha1dgst.o gnupgparse.o"
                OPS="$OPS \$(srcdir)/OPS.PGP"
        fi