fix configure.ac to reflect gpgme changes, fix AUTHORS

diff --git a/AUTHORS b/AUTHORS
index d2ba9014c88dced3658efc2f14f3872974017739..fb8f9c8e14f3fb09d95cb319870fd1ea4258975b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -210,4 +210,6 @@ contributors (beside the above; based on Changelog)
        Reza Pakdel
        Stephan Sachse
        Thomas Gilgin
+       Guy Rouillier
+       Jen-Yves Lefort
        George Michaelson

diff --git a/configure.ac b/configure.ac
index 801a58917958cd797e8d1578fdc5b4d38c0fc4ed..3a9d0754c42fcdd963b85470e97f480547de10e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -470,20 +470,6 @@ else
        AC_MSG_RESULT(no)
 fi
 
-dnl GPGME is used to support OpenPGP 
-AC_ARG_ENABLE(gpgme,
-       [  --enable-gpgme          Enable GnuPG support using GPGME [default=no]],
-       [ac_cv_enable_gpgme=$enableval], [ac_cv_enable_gpgme=no])
-AC_MSG_CHECKING([whether to use GPGME])
-if test $ac_cv_enable_gpgme = yes; then
-       AC_MSG_RESULT(yes)
-       AM_PATH_GPGME(0.3.10, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
-                     [use_gpgme=no
-                      ac_cv_enable_gpgme=no])
-else
-       AC_MSG_RESULT(no)
-fi
-
 dnl #######################################################################
 dnl # Check for startup notification
 dnl #######################################################################
@@ -535,10 +521,8 @@ AC_ARG_ENABLE(pgpmime-plugin,
        [  --disable-pgpmime-plugin           Do not build PGP/MIME plugin],
        [ac_cv_enable_pgpmime_plugin=$enableval], [ac_cv_enable_pgpmime_plugin=yes])
 if test x"$ac_cv_enable_pgpmime_plugin" = xyes; then
-       if test x"$ac_cv_enable_gpgme" != xyes; then
-               ac_cv_enable_pgpmime_plugin=no
-       fi
-
+       AM_PATH_GPGME(0.3.10, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
+                     [ac_cv_enable_pgpmime_plugin=no])
        if test x"$ac_cv_enable_pgpmime_plugin" = xyes; then
                PLUGINS="pgpmime $PLUGINS"
        fi
@@ -672,7 +656,6 @@ dnl Output the configuration summary
 echo ""
 echo "$PACKAGE $VERSION"
 echo ""
-echo "GnuPG         : $ac_cv_enable_gpgme"
 echo "JPilot        : $ac_cv_enable_jpilot"
 echo "LDAP          : $ac_cv_enable_ldap"
 echo "OpenSSL       : $ac_cv_enable_openssl"