sylpheedclaws/sylpheed-claws ChangeLog,1.396.2.667,1.396.2.668 PATCHSETS,1.1.2.1596,1.1.2.1597 configure.ac,1.654.2.1630,1.654.2.1631

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws
In directory sunsite.dk:/tmp/cvs-serv8183

Modified Files:
      Tag: gtk2
	ChangeLog PATCHSETS configure.ac 
Log Message:
2006-06-14 [paul]	2.3.0cvs10

	* configure.ac
		fix setting of PACKAGE_DATA_DIR with newer autoconf
		(backwards compatible) 

Index: ChangeLog
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/ChangeLog,v
retrieving revision 1.396.2.667
retrieving revision 1.396.2.668
diff -u -d -r1.396.2.667 -r1.396.2.668
--- ChangeLog	2006/06/13 16:37:17	1.396.2.667
+++ ChangeLog	2006/06/14 11:36:00	1.396.2.668
@@ -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: PATCHSETS
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/PATCHSETS,v
retrieving revision 1.1.2.1596
retrieving revision 1.1.2.1597
diff -u -d -r1.1.2.1596 -r1.1.2.1597
--- PATCHSETS	2006/06/13 16:37:16	1.1.2.1596
+++ PATCHSETS	2006/06/14 11:36:03	1.1.2.1597
@@ -1584,3 +1584,4 @@
 ( 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: configure.ac
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/configure.ac,v
retrieving revision 1.654.2.1630
retrieving revision 1.654.2.1631
diff -u -d -r1.654.2.1630 -r1.654.2.1631
--- configure.ac	2006/06/13 16:37:20	1.654.2.1630
+++ configure.ac	2006/06/14 11:36:04	1.654.2.1631
@@ -11,7 +11,7 @@
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -195,14 +195,10 @@
 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)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]