callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for libgpgme. (Support not added to mail yet.)

Browse Source 
* configure.in: Check for libgpgme. (Support not added to mail
	yet.)

svn path=/trunk/; revision=6641
This commit is contained in:
Dan Winship
2000-11-21 22:55:59 +00:00
parent 1f490e1092
commit 0c0ae216ec
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

1
acconfig.h
View File

@ -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

42
configure.in
View File

@ -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
"