2006-01-23 [paul] 1.9.100cvs181

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f3a9e44545c743b681c60e5455641619d3caaa36..fb9aa32fd8e64ae90f1f3f7a8501cfaff1b14107 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=99
+EXTRA_VERSION=181
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -159,18 +159,22 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
 AM_GNU_GETTEXT_VERSION([0.14.5])
 AM_GNU_GETTEXT([external])
 
+if test "x${DATADIRNAME}" = "x"; then
+  DATADIRNAME="share"
+  AC_SUBST(DATADIRNAME)
+fi
+
 localedir='${prefix}/${DATADIRNAME}/locale'
 AC_ARG_WITH(localedir,
        [  --with-localedir=DIR    Locale directory],
        [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
@@ -622,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
@@ -798,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
 ])