2006-06-14 [paul] 2.3.0cvs10
authorPaul Mangan <paul@claws-mail.org>
Wed, 14 Jun 2006 11:36:04 +0000 (11:36 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 14 Jun 2006 11:36:04 +0000 (11:36 +0000)
* configure.ac
fix setting of PACKAGE_DATA_DIR with newer autoconf
(backwards compatible)

ChangeLog
PATCHSETS
configure.ac

index 21c2780..e745812 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-14 [paul]      2.3.0cvs10
+
+       * configure.ac
+               fix setting of PACKAGE_DATA_DIR with newer autoconf
+               (backwards compatible)
+
 2006-06-13 [colin]     2.3.0cvs9
 
        * src/messageview.c
index e3251d9..91a3fbb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.213.2.98 -r 1.213.2.99 src/folder.c;  cvs diff -u -r 1.52.2.21 -r 1.52.2.22 src/prefs_folder_item.c;  ) > 2.3.0cvs7.patchset
 ( cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/quote_fmt_lex.l;  ) > 2.3.0cvs8.patchset
 ( cvs diff -u -r 1.94.2.86 -r 1.94.2.87 src/messageview.c;  ) > 2.3.0cvs9.patchset
+( cvs diff -u -r 1.654.2.1630 -r 1.654.2.1631 configure.ac;  ) > 2.3.0cvs10.patchset
index 4c03d8c..ae96000 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -195,14 +195,10 @@ AC_ARG_ENABLE(manual,
 AM_CONDITIONAL(BUILD_MANUAL, test x"$ac_cv_enable_manual" = xyes)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
+if test "x${prefix}" = "xNONE"; then
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)
-  fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", PACKAGE_DATA_DIR)
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)
 fi
 
 AC_CHECK_LIB(xpg4, setlocale)