Fixed compile-time warnings

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index 050479203429973d1af80bbc551ee045a144b3c4..e141644e5c14dd678016b0f17bcc8808e0617397 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,12 +5,15 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=7
-MICRO_VERSION=0
+MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws9
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
+dnl set $target
+AC_CANONICAL_SYSTEM
+
 dnl
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 dnl AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
@@ -54,12 +57,18 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_CPP
 dnl AC_PROG_RANLIB
-AM_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
+AM_PROG_LIBTOOL
 
 SYLPHEED_ACLOCAL_INCLUDE(ac)
 
+case "$target" in
+*-darwin*)
+       CFLAGS="$CFLAGS -traditional-cpp -fno-common"
+       ;;
+esac
+
 dnl for gettext
 ALL_LINGUAS="cs de el es fr hr it ja ko nl pl pt_BR ru sv"
 AM_GNU_GETTEXT
@@ -70,6 +79,17 @@ AC_SUBST(localedir)
 manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
 AC_SUBST(manualdir)
 
+dnl Set PACKAGE_DATA_DIR in config.h.
+if test "x${datadir}" = 'x${prefix}/share'; then
+  if test "x${prefix}" = "xNONE"; then
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
+  else
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+  fi
+else
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+fi
+
 dnl Checks for libraries.
 AM_PATH_GLIB(1.2.6,,
        AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
@@ -149,17 +169,19 @@ AC_MSG_CHECKING([whether to use JPilot])
 if test "$ac_cv_enable_jpilot" = yes; then
        AC_MSG_RESULT(yes)
        AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h,
-                        [ LIBS="$LIBS -lpisock"
-                          AC_DEFINE(USE_JPILOT) ],
+                        [ AC_DEFINE(USE_JPILOT) ],
                         [ ac_cv_enable_jpilot=no ])
        if test "$ac_cv_enable_jpilot" = no; then
                AC_CHECK_HEADERS(libpisock/pi-args.h libpisock/pi-appinfo.h libpisock/pi-address.h,
-                                [ LIBS="$LIBS -lpisock"
-                                  ac_cv_enable_jpilot=yes
+                                [ ac_cv_enable_jpilot=yes
                                   AC_DEFINE(USE_JPILOT) ])
        fi
        AC_MSG_CHECKING([whether jpilot is available])
        AC_MSG_RESULT($ac_cv_enable_jpilot)
+
+       if test "$ac_cv_enable_jpilot" = yes; then
+               LIBS="$LIBS -lpisock"
+       fi
 else
        AC_MSG_RESULT(no)
 fi
@@ -173,24 +195,17 @@ AC_MSG_CHECKING([whether to use LDAP])
 if test "$ac_cv_enable_ldap" = yes; then
        AC_MSG_RESULT(yes)
        AC_CHECK_HEADERS(ldap.h lber.h pthread.h,
-                        [ LIBS="$LIBS -lldap -llber -lpthread -lresolv `glib-config --libs gthread`"
-                          AC_DEFINE(USE_LDAP) ],
+                        [ AC_DEFINE(USE_LDAP) ],
                         [ ac_cv_enable_ldap=no ])
        AC_MSG_CHECKING([whether ldap is available])
        AC_MSG_RESULT($ac_cv_enable_ldap)
-else
-       AC_MSG_RESULT(no)
-fi
 
-dnl get ispell path
-dnl
-AC_PATH_PROG(ispell_path, ispell, no)
-if test "$ispell_path" != no; then
-       AC_DEFINE_UNQUOTED(ISPELL_PATH, "$ispell_path")
-       AC_SUBST(ISPELL_PATH)
+       if test "$ac_cv_enable_ldap" = yes; then
+               CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
+               LIBS="$LIBS -lldap -llber -lpthread -lresolv `$GLIB_CONFIG --libs gthread`"
+       fi
 else
-       AC_DEFINE_UNQUOTED(ISPELL_PATH, "/usr/bin/ispell")
-       AC_SUBST(ISPELL_PATH)
+       AC_MSG_RESULT(no)
 fi
 
 dnl Check for libjconv
@@ -260,6 +275,8 @@ if test $ac_cv_enable_pspell = yes; then
        AC_MSG_RESULT(yes)
        AM_PATH_PSPELL(.12.2, AC_DEFINE(USE_PSPELL), [use_pspell=no
                                                    ac_cv_enable_pspell=no])
+       pspell_path="`pspell-config --pkgdatadir`"
+       AC_DEFINE_UNQUOTED(PSPELL_PATH, "${pspell_path}/")
 else
        AC_MSG_RESULT(no)
 fi