-AC_PREREQ(2.60)
+AC_PREREQ(2.59)
AC_INIT(src/main.c)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
dnl version number
MAJOR_VERSION=3
MINOR_VERSION=7
-MICRO_VERSION=6
+MICRO_VERSION=8
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=35
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
CFLAGS="$CFLAGS -Wno-pointer-sign"
fi
-CFLAGS="$CFLAGS -Wall"
+CFLAGS="$CFLAGS -Wall -Wno-pointer-sign"
if test $USE_MAINTAINER_MODE = yes; then
- CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
+ CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
fi
pthread_name=
LIBS=$syl_save_LIBS
dnl for gettext
-ALL_LINGUAS="bg ca cs de en_GB es fi fr hu id it ja nl pl pt_BR pt_PT ru sk sv uk zh_CN"
+ALL_LINGUAS="bg ca cs de en_GB es fi fr hu id it ja lt nl pl pt_BR pt_PT ru sk sv uk zh_CN"
GETTEXT_PACKAGE=claws-mail
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
[ --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 ******************************
+
+AC_PATH_PROG(DOCBOOK2HTML, docbook2html)
+AC_PATH_PROG(DOCBOOK2TXT, docbook2txt)
+AC_PATH_PROG(DOCBOOK2PS, docbook2ps)
+AC_PATH_PROG(DOCBOOK2PDF, docbook2pdf)
+
+AM_CONDITIONAL(MANUAL_HTML, test -n "$DOCBOOK2HTML")
+AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
+AM_CONDITIONAL(MANUAL_PDF, test -n "$DOCBOOK2PDF")
+AM_CONDITIONAL(MANUAL_PS, test -n "$DOCBOOK2PS")
+
+if test x"$ac_cv_enable_manual" = x"yes"; then
+ if test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" \
+ -o -n "$DOCBOOK2PS" -o -n "$DOCBOOK2PDF"; then
+ ac_cv_enable_manual=yes
+ else
+ ac_cv_enable_manual=no
+ fi
+fi
+
AM_CONDITIONAL(BUILD_MANUAL, test x"$ac_cv_enable_manual" = xyes)
dnl Set PACKAGE_DATA_DIR in config.h.
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"
AC_MSG_RESULT(no - LDAP support needs pthread support)
ac_cv_enable_ldap=no
+elif test x"$platform_win32" = xyes; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)
+ LDAP_LIBS="-lwldap32"
+ AC_SUBST(LDAP_LIBS)
else
AC_MSG_RESULT(yes)
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