2010-10-03 [colin] 3.7.6cvs51

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 75b5a1fc4ff801352fe7eeeaf5b900ba69417b5b..c610575b56458fbdc56e47daa24964167ed64f16 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_PREREQ(2.60)
+AC_PREREQ(2.59)
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=51
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -174,7 +174,7 @@ case "$target" in
        ;;
 *-*-solaris*)
        CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
-       CFLAGS="$CFLAGS -DSOLARIS"
+       CFLAGS="$CFLAGS -std=gnu99 -DSOLARIS"
        ;;
 esac
   
@@ -208,6 +208,50 @@ AC_ARG_ENABLE(manual,
        [  --disable-manual           do not build manual],
        [ac_cv_enable_manual=$enableval], [ac_cv_enable_manual=yes])
 
+dnl ******************************
+dnl ** Check for required tools **
+dnl ** to build manuals         **
+dnl ******************************
+SAXON=`which saxon 2> /dev/null`
+if test $? -ne 0; then
+       SAXON=
+fi
+if test -z "$SAXON"; then
+        SAXONJAR='/usr/share/java/saxon.jar'
+        if test ! -f "$SAXONJAR"; then
+                SAXONJAR='/usr/local/share/java/saxon.jar'
+                if test ! -f "$SAXONJAR"; then
+                        SAXONJAR=
+                fi
+        fi
+fi
+AM_CONDITIONAL(MANUAL_PDF, test -n "$SAXON" -o -n "$SAXONJAR")
+
+DOCBOOK2TXT=`which docbook2txt 2> /dev/null`
+if test $? -ne 0; then
+       DOCBOOK2TXT=
+fi
+AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
+
+DOCBOOK2HTML=`which docbook2html 2> /dev/null`
+if test $? -ne 0; then
+        DOCBOOK2HTML=
+fi
+AM_CONDITIONAL(MANUAL_HTML, test -n "$DOCBOOK2HTML")
+
+DOCBOOK2PS=`which docbook2ps 2> /dev/null`
+if test $? -ne 0; then
+        DOCBOOK2PS=
+fi
+AM_CONDITIONAL(MANUAL_PS, test -n "$DOCBOOK2PS")
+
+if test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" -o -n "$DOCBOOK2PS" \
+       -o -n "$SAXON" -o -n "$SAXONJAR"; then
+       ac_cv_enable_manual="yes"
+else
+       ac_cv_enable_manual="no"
+fi
+
 AM_CONDITIONAL(BUILD_MANUAL, test x"$ac_cv_enable_manual" = xyes)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
@@ -382,16 +426,9 @@ fi
 
 dnl GNUTLS
 AC_MSG_CHECKING([whether to use GnuTLS])
-AC_ARG_ENABLE(openssl,    [  --enable-openssl      enable GnuTLS support],
-            [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=no])
 AC_ARG_ENABLE(gnutls,    [  --enable-gnutls      enable GnuTLS support],
             [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
 
-if test "x$ac_cv_enable_gnutls" != "xyes"; then
-       if test "x$ac_cv_enable_openssl" = "xyes"; then
-               AC_MSG_ERROR(*** Use GnuTLS instead of OpenSSL due to licensing ***)
-       fi
-fi
 AC_MSG_RESULT($ac_cv_enable_gnutls)
 if test "x$ac_cv_enable_gnutls" != "xno"; then
   OCPPFLAGS="$CPPFLAGS"
@@ -1034,7 +1071,6 @@ src/plugins/bogofilter/Makefile
 src/plugins/spamassassin/Makefile
 src/plugins/dillo_viewer/Makefile
 src/plugins/trayicon/Makefile
-src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/pgpcore/Makefile
 src/plugins/pgpmime/Makefile
 src/plugins/pgpinline/Makefile