aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-11-22 06:55:59 +0800
committerDan Winship <danw@src.gnome.org>2000-11-22 06:55:59 +0800
commit0c0ae216ecdab55c543ca8b1210757a488cb2f66 (patch)
tree485d00e1953fa3a6a7b8a172a4be588917a98887
parent1f490e1092a9482d8cef832b820295f21a71a37e (diff)
downloadgsoc2013-evolution-0c0ae216ecdab55c543ca8b1210757a488cb2f66.tar.gz
gsoc2013-evolution-0c0ae216ecdab55c543ca8b1210757a488cb2f66.tar.zst
gsoc2013-evolution-0c0ae216ecdab55c543ca8b1210757a488cb2f66.zip
Check for libgpgme. (Support not added to mail yet.)
* configure.in: Check for libgpgme. (Support not added to mail yet.) svn path=/trunk/; revision=6641
-rw-r--r--ChangeLog5
-rw-r--r--acconfig.h1
-rw-r--r--configure.in42
3 files changed, 32 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 718a34c931..8304f9a714 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-21 Dan Winship <danw@helixcode.com>
+
+ * configure.in: Check for libgpgme. (Support not added to mail
+ yet.)
+
2000-11-21 Federico Mena Quintero <federico@helixcode.com>
* configure.in (EVOLUTION_DIR): Removed the
diff --git a/acconfig.h b/acconfig.h
index de3e404849..7e9b142643 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -16,6 +16,7 @@
#undef HAVE_KRB4
#undef HAVE_KRB5
#undef MOVEMAIL_PATH
+#undef HAVE_LIBGPGME
#undef PGP_PROGRAM
#undef GPG_PATH
#undef PGP5_PATH
diff --git a/configure.in b/configure.in
index 8746d24bf0..ba0aff47a7 100644
--- a/configure.in
+++ b/configure.in
@@ -575,27 +575,37 @@ fi
dnl **********
dnl GPGPGPGPGP
dnl **********
-AC_PATH_PROG(GPG, gpg)
-priv=None
-if test -n "$GPG"; then
- AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG")
- AC_DEFINE(PGP_PROGRAM, "GPG")
- priv="GNU PG"
+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
- AC_PATH_PROG(PGP5, pgpv)
- if test -n "$PGP5"; then
- AC_DEFINE_UNQUOTED(PGP5_PATH, "$PGP5")
- AC_DEFINE(PGP_PROGRAM, "PGP")
- priv="PGP5"
+ 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(PGP, pgp)
- if test -n "$PGP"; then
- AC_DEFINE_UNQUOTED(PGP_PATH, "$PGP")
+ AC_PATH_PROG(PGP5, pgpv)
+ if test -n "$PGP5"; then
+ AC_DEFINE_UNQUOTED(PGP5_PATH, "$PGP5")
AC_DEFINE(PGP_PROGRAM, "PGP")
- priv=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
@@ -696,5 +706,5 @@ echo "
Pilot conduits: $msg_pilot
Kerberos 4/5: $msg_krb4/$msg_krb5
Use movemail: $with_movemail
- Crypto support: $priv
+ Crypto support: $msg_crypto
"