Handle CANNOT_DUMP (partially) with configure.

* configure.in (cannot_dump): New output variable.

* src/Makefile.in (CANNOT_DUMP): New, set by configure.
(emacs${EXEEXT}, bootstrap-emacs${EXEEXT}): Use $CANNOT_DUMP.

* msdos/sed1v2.inp (CANNOT_DUMP): Edit to no.

diff --git a/ChangeLog b/ChangeLog
index 1615145c4f364fd58d2500b55fdce9961bb60e27..7ec751044ef771623444297f0966efa3829b27ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * configure.in (cannot_dump): New output variable.
+
 2010-05-20  enami tsugutomo  <tsugutomo.enami@jp.sony.com>
 
        * configure.in: On NetBSD, if terminfo is found, use it in

diff --git a/configure.in b/configure.in
index 3d11ef584fa47597360b9feb5d5e631aa27827ce..29f8c8ef6040eaf438a09caa53326afb31a20c23 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -857,6 +857,12 @@ configure___ LIBX=-lX11
 
 configure___ unexec=UNEXEC
 
+#ifdef CANNOT_DUMP
+configure___ cannot_dump=yes
+#else
+configure___ cannot_dump=no
+#endif
+
 #ifdef SYSTEM_MALLOC
 configure___ system_malloc=yes
 #else
@@ -918,6 +924,9 @@ fi]
 rm ${tempcname}
 
 
+AC_SUBST(cannot_dump)
+
+
 LD_SWITCH_SYSTEM=
 case "$opsys" in
   freebsd)
@@ -1483,6 +1492,7 @@ if test "${with_ns}" != no; then
      GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
      GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
      ## Pull in stuff from GNUstep-make.
+     ## FIXME? Cleaner to use AC_SUBST_FILE for this?
      NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
 GUI_LIB=gnu
 include $GNUSTEP_MAKEFILES/Additional/base.make

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 46730bff694c3b133da3b87880498ca628d944e3..3afea1696e7486f5f66bffa51fb43fcdcfd993b5 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * sed1v2.inp (CANNOT_DUMP): Edit to no.
+
 2010-05-20  Glenn Morris  <rgm@gnu.org>
 
        * sed1v2.inp (DEPFLAGS, deps_frag): Edit to empty.

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 37002a5dbd66326a653b7dbb2a6b3deae4275126..ba6846b9648594404d22216f416f3de97975e229 100644 (file)
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -123,6 +123,7 @@ s/\.h\.in/.h-in/
 /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
 /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
 /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/
+/^CANNOT_DUMP *=/s/@cannot_dump@/no/
 /^DEPFLAGS *=/s/@DEPFLAGS@//
 /^MKDEPDIR *=/s/@MKDEPDIR@/:/
 /^version *=/s/@[^@\n]*@//

diff --git a/src/ChangeLog b/src/ChangeLog
index 13ab4682df33ce64902a96871930796970de7099..5c99ed914349407d3b4f37fb28184dd2a0dc0bb6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (CANNOT_DUMP): New, set by configure.
+       (emacs${EXEEXT}, bootstrap-emacs${EXEEXT}): Use $CANNOT_DUMP.
+
 2010-05-20  Juri Linkov  <juri@jurta.org>
 
        * fileio.c (Fdelete_file): Change interative spec to use

diff --git a/src/Makefile.in b/src/Makefile.in
index 1af812d6e15671019fbba12120f95aa6cf3c3f08..dd1eec73c1f0eb0c4a219f57b96b707e94fdec1e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -284,6 +284,8 @@ START_FILES = @START_FILES@
 
 UNEXEC_OBJ = @unexec@
 
+CANNOT_DUMP=@cannot_dump@
+
 DEPDIR=deps
 ## -MMD -MF ${DEPDIR}/$*.d if AUTO_DEPEND; else empty.
 DEPFLAGS=@DEPFLAGS@
@@ -599,18 +601,19 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
 all: emacs${EXEEXT} $(OTHER_FILES)
 
 /* Does anyone ever pay attention to the load-path-shadows output here?  */
+/* FIXME Add EXEEXT for load-path-shadows?  */
+/* The dumped Emacs is as functional and more efficient than
+   bootstrap-emacs, so we replace the latter with the former.  */
 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
-#ifdef CANNOT_DUMP
-       rm -f emacs${EXEEXT}
-       ln temacs${EXEEXT} emacs${EXEEXT}
-       -EMACSLOADPATH=${lispsource} ./emacs -q -batch -f list-load-path-shadows
-#else
-       LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
-       @: This new Emacs is as functional and more efficient then
-       @: bootstrap-emacs, so let us replace it.
-       -ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
-       -./emacs -q -batch -f list-load-path-shadows
-#endif /* ! defined (CANNOT_DUMP) */
+       if test "${CANNOT_DUMP}" = "yes"; then \
+         ln -f temacs${EXEEXT} emacs${EXEEXT}; \
+         EMACSLOADPATH=${lispsource} ./emacs -q -batch \
+           -f list-load-path-shadows || true; \
+       else \
+         LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
+         ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}; \
+         ./emacs -q -batch -f list-load-path-shadows || true; \
+       fi
 
 /* We run make-docfile twice because the command line may get too long
    on some systems.  */
@@ -807,12 +810,12 @@ ${lispsource}loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
 
 bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
        cd ../lisp; $(MAKE) $(MFLAGS) update-subdirs
-#ifdef CANNOT_DUMP
-       ln -f temacs${EXEEXT} bootstrap-emacs${EXEEXT}
-#else
-       $(RUN_TEMACS) --batch --load loadup bootstrap
-       mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
-#endif /* ! defined (CANNOT_DUMP) */
+       if test "${CANNOT_DUMP}" = "yes"; then \
+         ln -f temacs${EXEEXT} bootstrap-emacs${EXEEXT}; \
+       else \
+         $(RUN_TEMACS) --batch --load loadup bootstrap || exit 1; \
+         mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}; \
+       fi
        @: Compile some files earlier to speed up further compilation.
        cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe}