# HG changeset patch
# User Mike Sperber <sperber@deinprogramm.de>
# Date 1268916149 -3600
# Node ID b72f27a08ed55fa2f94bcb7116c2e83561463e25
# Parent  9c4bf82eaac2d68ac74b49adb25161a7f10b15d7
Reflect --with-datadir setting in late-package directories.

2010-03-18  Mike Sperber  <mike@xemacs.org>

	* configure.ac: Set LATE_PACKAGE_DIRECTORIES_USER_DEFINED if
	`datadir' was changed; set `with_late_packages' to something
	sensible for this case.

diff -r 9c4bf82eaac2 -r b72f27a08ed5 ChangeLog
--- a/ChangeLog	Thu Mar 18 11:53:38 2010 +0100
+++ b/ChangeLog	Thu Mar 18 13:42:29 2010 +0100
@@ -1,3 +1,9 @@
+2010-03-18  Mike Sperber  <mike@xemacs.org>
+
+	* configure.ac: Set LATE_PACKAGE_DIRECTORIES_USER_DEFINED if
+	`datadir' was changed; set `with_late_packages' to something
+	sensible for this case.
+
 2010-02-20  Ben Wing  <ben@xemacs.org>
 
 	* configure.ac (XE_COMPLEX_ARG):
diff -r 9c4bf82eaac2 -r b72f27a08ed5 configure
--- a/configure	Thu Mar 18 11:53:38 2010 +0100
+++ b/configure	Thu Mar 18 13:42:29 2010 +0100
@@ -1995,13 +1995,14 @@
   --with-quick-build      Speed up the build cycle by leaving out steps where
                           XEmacs will still work (more or less) without them.
                           Potentially dangerous if you don't know what you're
-                          doing. This (1) doesn't garbage-collect after
-                          loading each file during dumping, (2) doesn't
+                          doing. This (1) Doesn't garbage-collect after
+                          loading each file during dumping, (2) Doesn't
                           automatically rebuild the DOC file (remove it by
                           hand to get it rebuilt), (3) Removes config.h,
                           lisp.h and associated files from the dependency
                           lists, so changes to these files don't automatically
-                          cause all .c files to be rebuilt.
+                          cause all .c files to be rebuilt, (4) Doesn't check
+                          for Lisp shadows.
   --with-union-type       Use union definition of Lisp_Object type. Known to
                           trigger bugs in some compilers.
   --with-quantify         Support performance debugging using Quantify.
@@ -5509,6 +5510,8 @@
 
   $as_echo "#define ETCDIR_USER_DEFINED 1" >>confdefs.h
 
+  $as_echo "#define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+
 fi
 
 if test "x$libdir" != "x\${exec_prefix}/lib"
@@ -5533,6 +5536,7 @@
 inststaticdir='${PROGNAME}'
 instvardir='${PROGNAME}-${version}'
 sitemoduledir='${libdir}/${inststaticdir}/site-modules'
+with_late_packages='${datadir}/${PROGNAME}'
 
 
 statedir=$with_statedir
diff -r 9c4bf82eaac2 -r b72f27a08ed5 configure.ac
--- a/configure.ac	Thu Mar 18 11:53:38 2010 +0100
+++ b/configure.ac	Thu Mar 18 13:42:29 2010 +0100
@@ -1108,6 +1108,7 @@
   AC_DEFINE(INFODIR_USER_DEFINED)
   AC_DEFINE(LISPDIR_USER_DEFINED)
   AC_DEFINE(ETCDIR_USER_DEFINED)
+  AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)
 fi
 
 if test "x$libdir" != "x\${exec_prefix}/lib"
@@ -1128,6 +1129,7 @@
 inststaticdir='${PROGNAME}'
 instvardir='${PROGNAME}-${version}'
 sitemoduledir='${libdir}/${inststaticdir}/site-modules'
+with_late_packages='${datadir}/${PROGNAME}'
 
 AC_SUBST(inststaticdir)
 AC_SUBST(statedir,$with_statedir)