* src/quote_fmt.c

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index c0556c05ea698587b040fc07163bd49e1cf48e43..7b5d7746677573b2c31a413db1df54f06de94094 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,10 +5,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=7
-MICRO_VERSION=0
+MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws7
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -79,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.),
@@ -197,17 +208,6 @@ 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)
-else
-       AC_DEFINE_UNQUOTED(ISPELL_PATH, "/usr/bin/ispell")
-       AC_SUBST(ISPELL_PATH)
-fi
-
 dnl Check for libjconv
 AC_ARG_ENABLE(jconv,
        [  --disable-jconv         Do not use libjconv],
@@ -275,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