aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in35
2 files changed, 4 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a01cf8cbd..798597ed34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-12 Jeffrey Stedfast <fejj@ximian.com>
+
+ * configure.in: Take out the PGP/GPG detection stuff.
+
2001-01-12 Federico Mena Quintero <federico@ximian.com>
* configure.in: Suggest what to do if gtk-doc is not found.
diff --git a/configure.in b/configure.in
index cfa53818de..31d6b4b771 100644
--- a/configure.in
+++ b/configure.in
@@ -600,41 +600,6 @@ else
esac
fi
-dnl **********
-dnl GPGPGPGPGP
-dnl **********
-AC_PATH_PROG(GPGME_CONFIG, gpgme-config)
-if test -n "$GPGME_CONFIG"; then
- AC_DEFINE(HAVE_LIBGPGME)
- GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
- GPGME_LIBS=`$GPGME_CONFIG --libs`
- msg_crypto="GNU PG (via libgpgme)"
-else
- msg_crypto=None
- AC_PATH_PROG(GPG, gpg)
- if test -n "$GPG"; then
- AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG")
- AC_DEFINE(PGP_PROGRAM, "GPG")
- msg_crypto="GNU PG"
- else
- AC_PATH_PROG(PGP5, pgpv)
- if test -n "$PGP5"; then
- AC_DEFINE_UNQUOTED(PGP5_PATH, "$PGP5")
- AC_DEFINE(PGP_PROGRAM, "PGP")
- msg_crypto="PGP5"
- else
- AC_PATH_PROG(PGP, pgp)
- if test -n "$PGP"; then
- AC_DEFINE_UNQUOTED(PGP_PATH, "$PGP")
- AC_DEFINE(PGP_PROGRAM, "PGP")
- msg_crypto=PGP
- fi
- fi
- fi
-fi
-AC_SUBST(GPGME_CFLAGS)
-AC_SUBST(GPGME_LIBS)
-
dnl ******************************
dnl Makefiles
dnl ******************************