2005-09-14 [paul] 1.9.14cvs26

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d0897a20889d1f40994ecffbefb280318a115622..dbf5d40f826d30710db086cd8ec5bff8fa4a95e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=1
 MINOR_VERSION=9
-MICRO_VERSION=13
+MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=26
@@ -128,6 +128,10 @@ case "$target" in
 *-darwin*)
        CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
        ;;
+*-*-mingw*)
+       CFLAGS="$CFLAGS -mms-bitfields"
+       LIBS="$LIBS -lws2_32"
+       ;;
 esac
   
 dnl Checks for iconv
@@ -142,7 +146,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW.Big5"
+ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW"
 GETTEXT_PACKAGE=sylpheed-claws
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
@@ -151,11 +155,21 @@ AM_GLIB_GNU_GETTEXT
 dnl AM_GNU_GETTEXT
 dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
 localedir='${prefix}/${DATADIRNAME}/locale'
+AC_ARG_WITH(localedir,
+       [  --with-localedir=DIR    Locale directory],
+       [localedir="$withval"])
 AC_SUBST(localedir)
 
 manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
+AC_ARG_WITH(manualdir,
+       [  --with-manualdir=DIR    Manual directory],
+       [manualdir="$withval"])
 AC_SUBST(manualdir)
+
 faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
+AC_ARG_WITH(faqdir,
+       [  --with-faqdir=DIR       FAQ directory],
+       [faqdir="$withval"])
 AC_SUBST(faqdir)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
@@ -209,7 +223,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
                 sys/param.h sys/utsname.h sys/select.h \
-                wchar.h wctype.h locale.h)
+                wchar.h wctype.h locale.h netdb.h)
 
 dnl alf - Check for apache installation f*ck up. apache may also install an 
 dnl fnmatch, which includes their own regex stuff if USE_HSREGEX is defined
@@ -251,7 +265,7 @@ AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr strchr \
               wcsstr wcswcs iswalnum iswspace towlower \
               wcslen wcscpy wcsncpy \
               uname flock lockf inet_aton inet_addr \
-              fchmod mkstemp)
+              fchmod mkstemp truncate getuid regcomp)
 
 dnl *****************
 dnl ** common code **
@@ -353,8 +367,8 @@ AC_SUBST(GTK_LIBS)
 
 dnl GNU/Aspell is used for spell checking
 AC_ARG_ENABLE(aspell,
-       [  --enable-aspell         Enable GNU/aspell support [default=no]],
-       [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=no])
+       [  --disable-aspell         Disable GNU/aspell support [default=yes]],
+       [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=yes])
 AC_MSG_CHECKING([whether to use GNU/aspell])
 if test $ac_cv_enable_aspell = yes; then
        AC_MSG_RESULT(yes)
@@ -445,8 +459,8 @@ LIBS="$LIBS $LIBRESOLV"
 dnl for LDAP support in addressbook
 dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,
-       [  --enable-ldap           Enable LDAP support [default=no]],
-       [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
+       [  --disable-ldap         Do not build LDAP support [default=yes]],
+       [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=yes])
 AC_MSG_CHECKING([whether to use LDAP])
 if test x"$ac_cv_enable_ldap" = xno; then
        AC_MSG_RESULT(no)
@@ -487,9 +501,8 @@ else
        AC_MSG_RESULT($ac_cv_have_tls)
 
        if test "$ac_cv_enable_ldap" = yes; then
-               CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
-               LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"
                AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)
+               LDAP_LIBS="$LDAP_LIBS -lldap"
                AC_SUBST(LDAP_LIBS)
                if test "$ac_cv_have_tls" = yes; then
                        AC_DEFINE(USE_LDAP_TLS, 1, Define if you want LDAP TLS support in addressbook.)
@@ -500,8 +513,8 @@ fi
 dnl for JPilot support in addressbook
 dnl no check for libraries; these are dynamically loaded
 AC_ARG_ENABLE(jpilot,
-       [  --enable-jpilot         Enable JPilot support [default=no]],
-       [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=no])
+       [  --disable-jpilot         Enable JPilot support [default=yes]],
+       [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=yes])
 AC_MSG_CHECKING([whether to use JPilot])
 if test "$ac_cv_enable_jpilot" = yes; then
        AC_MSG_RESULT(yes)