2006-02-09 [wwp] 2.0.0cvs40

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8ea087ad8cfb8cca0ceb0bc8461578be01b9f3be..104596726c9e50218ead6c046ea5e622c649d0b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,12 +6,12 @@ AC_CONFIG_AUX_DIR(config)
 PACKAGE=sylpheed-claws
 
 dnl version number
-MAJOR_VERSION=1
-MINOR_VERSION=9
-MICRO_VERSION=100
+MAJOR_VERSION=2
+MINOR_VERSION=0
+MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=156
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -170,12 +170,17 @@ 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)
+
+AC_ARG_ENABLE(manual,
+       [  --disable-manual           Disable manual support],
+       [ac_cv_enable_manual=$enableval], [ac_cv_enable_manual=yes])
+
+AM_CONDITIONAL(BUILD_MANUAL, test x"$ac_cv_enable_manual" = xyes)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
@@ -809,6 +814,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
 ])
 
@@ -825,7 +837,8 @@ echo "IPv6          : $ac_cv_enable_ipv6"
 echo "GNU/aspell    : $ac_cv_enable_aspell"
 echo "IMAP4         : $ac_cv_enable_libetpan"
 echo "Crash dialog  : $ac_cv_enable_crash_dialog"
-echo "libgnomeprint : $ac_cv_enable_gnomeprint"
+echo "Libgnomeprint : $ac_cv_enable_gnomeprint"
+echo "Manual        : $ac_cv_enable_manual"
 echo "Plugins       : $PLUGINS"
 echo "Config dir    : $ac_cv_with_config_dir"
 echo ""