2006-01-24 [paul] 1.9.100cvs183

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d014eb56e0fa017841d25a0039a80e77bdf2d19b..e384c8f1d87689906e2578ac78e528266eba92d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=117
+EXTRA_VERSION=183
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -170,12 +170,11 @@ AC_ARG_WITH(localedir,
        [localedir="$withval"])
 AC_SUBST(localedir)
 
-dnl waiting for the new manual to be finished
-dnl manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
-dnl AC_ARG_WITH(manualdir,
-dnl    [  --with-manualdir=DIR    Manual directory],
-dnl    [manualdir="$withval"])
-dnl AC_SUBST(manualdir)
+manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
+AC_ARG_WITH(manualdir,
+       [  --with-manualdir=DIR    Manual directory],
+       [manualdir="$withval"])
+AC_SUBST(manualdir)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
@@ -627,6 +626,12 @@ if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
                      [ac_cv_enable_pgpcore_plugin=no])
        if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
                PLUGINS="pgpcore $PLUGINS"
+                AM_PATH_GPGME(1.1.1,
+                              AC_DEFINE(HAVE_GPGME_PKA_TRUST, 1,
+                                        [Define if GPGME supports PKA.]))
+               #needed to get GPGME_LIBS and al correctly
+               AM_PATH_GPGME(1.0.0, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
+                         [ac_cv_enable_pgpcore_plugin=no])
        else
                AC_MSG_WARN([*** PGP/CORE plugin will not be built ***])
        fi
@@ -803,6 +808,13 @@ doc/Makefile
 doc/man/Makefile
 tools/Makefile
 config/Makefile
+manual/Makefile
+manual/dtd/Makefile
+manual/dist/Makefile
+manual/dist/pdf/Makefile
+manual/dist/ps/Makefile
+manual/dist/html/Makefile
+manual/dist/txt/Makefile
 sylpheed-claws.pc
 ])