* configure.in: Set CANNOT_DUMP on ia64 hpux (port from emacs-23).

2 files changed, 13 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ff3459d66b..0293a562481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-25  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in: Set CANNOT_DUMP on ia64 hpux (port from emacs-23).
+
 2011-01-25  Peter O'Gorman  <bug-gnu-emacs@mlists.thewrittenword.com>  (tiny change)
 
         * configure.in: Add HP-UX on IA64 (Bug#6811).
diff --git a/configure.in b/configure.in
index 4e8a31ecc56..a3ff7f1e3c4 100644
--- a/configure.in
+++ b/configure.in
@@ -517,6 +517,9 @@ case "${canonical}" in
 
   ia64*-hp-hpux1[1-9]* )
     machine=hp800 opsys=hpux11
+    ## FIXME.  Peter O'Gorman reports that dumping using unexelf.o doesn't
+    ## work either: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6811
+    CANNOT_DUMP=yes    
   ;;
 
   hppa*-*-linux-gnu* )
@@ -851,16 +854,16 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
 CPP=`eval "echo $CPP"`
 
 
-dnl Not used by any currently supported platform.
 dnl The function dump-emacs will not be defined and temacs will do
 dnl (load "loadup") automatically unless told otherwise.
-CANNOT_DUMP=no
+test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no
 case "$opsys" in
-  your-opsys-here)
-   CANNOT_DUMP=yes
-   AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.])
-  ;;
+  your-opsys-here) CANNOT_DUMP=yes ;;
 esac
+
+test "$CANNOT_DUMP" = "yes" && \
+  AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.])
+
 AC_SUBST(CANNOT_DUMP)