2005-01-04 [christoph] 0.9.13cvs27

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ba7ec0ae172ff13fb995b7095a3d1e23965e9d08..86a4bb258cfc3cb9755efff9aab590bf4b8ffe91 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=9
-MICRO_VERSION=12
+MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=148
+EXTRA_VERSION=27
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
@@ -443,20 +443,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 #######################################################################
@@ -508,9 +494,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"
@@ -651,7 +636,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"