Move UNEXEC definition to autoconf.

* configure.in (unxec): Do not define and substitute.
(UNEXEC_OBJ): New output variable, replaces cpp UNEXEC.

* msdos/sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.

* src/s/usg5-4.h (UNEXEC): Remove, move to configure.in.
* src/s/sol2-10.h (UNEXEC):
* src/s/irix6-5.h (UNEXEC):
* src/s/hpux10-20.h (UNEXEC):
* src/s/gnu-linux.h (UNEXEC):
* src/s/darwin.h (UNEXEC):
* src/s/cygwin.h (UNEXEC):
* src/s/bsd-common.h (UNEXEC):
* src/s/aix4-2.h (UNEXEC):
* src/m/alpha.h (UNEXEC): Likewise.
* src/Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.

12 files changed, 16 insertions, 37 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bb430266367..728a442e86b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2010-06-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Move UNEXEC definition to autoconf.
+        * s/usg5-4.h (UNEXEC): Remove, move to configure.in.
+        * s/sol2-10.h (UNEXEC):
+        * s/irix6-5.h (UNEXEC):
+        * s/hpux10-20.h (UNEXEC):
+        * s/gnu-linux.h (UNEXEC):
+        * s/darwin.h (UNEXEC):
+        * s/cygwin.h (UNEXEC):
+        * s/bsd-common.h (UNEXEC):
+        * s/aix4-2.h (UNEXEC):
+        * m/alpha.h (UNEXEC): Likewise.
+        * Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.
+
 2010-06-03  Juanma Barranquero  <lekktu@gmail.com>
 
         Remove obsolete pre-unicode2 macros.
diff --git a/src/Makefile.in b/src/Makefile.in
index 336980f4285..ceef8c3bf67 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -281,7 +281,7 @@ RUN_TEMACS = `/bin/pwd`/temacs
 
 START_FILES = @START_FILES@
 
-UNEXEC_OBJ = @unexec@
+UNEXEC_OBJ = @UNEXEC_OBJ@
 
 CANNOT_DUMP=@cannot_dump@
 
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 04ad9eaaf8f..c57fd0d9821 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -62,8 +62,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef __ELF__
 
-#undef UNEXEC
-#define UNEXEC unexelf.o
 #if !defined(GNU_LINUX) && !defined(__NetBSD__)
 #define DATA_START    0x140000000
 #endif
@@ -78,9 +76,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define TEXT_START    0x120000000
 #define DATA_START    0x140000000
 
-/* The program to be used for unexec. */
-#define UNEXEC unexalpha.o
-
 #endif /* __ELF__ */
 
 /* On the Alpha it's best to avoid including TERMIO since struct
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 5212c432843..32c29675012 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -104,7 +104,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    to avoid a crash just use the Emacs implementation for that function.  */
 #define BROKEN_GET_CURRENT_DIR_NAME 1
 
-#define UNEXEC unexaix.o
-
 /* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
    (do not change this comment) */
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 2a8934d7f50..1d7ebbace13 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -47,8 +47,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SYSV_SYSTEM_DIR
 
-#define UNEXEC unexelf.o
-
 /* If the system's imake configuration file defines `NeedWidePrototypes'
    as `NO', we must define NARROWPROTO manually.  Such a define is
    generated in the Makefile generated by `xmkmf'.  If we don't
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index b6d0c7c88ff..6204cee392b 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -93,7 +93,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 #define SYSV_SYSTEM_DIR 1
-#define UNEXEC unexcw.o
 
 #define HAVE_SOCKETS
 
diff --git a/src/s/darwin.h b/src/s/darwin.h
index a30360576a8..399c3d325c1 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -123,9 +123,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 #define HAVE_SOCKETS
 
-/* Definitions for how to dump.  Copied from nextstep.h.  */
-#define UNEXEC unexmacosx.o
-
 /* start_of_text isn't actually used, so make it compile without error.  */
 #define TEXT_START (0)
 
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index f1ec7d99a4b..8b63865d9f9 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -131,8 +131,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define POSIX                 /* affects getpagesize.h and systty.h */
 
-#define UNEXEC unexelf.o
-
 /* This is to work around mysterious gcc failures in some system versions.
    It is unlikely that Emacs changes will work around this problem;
    therefore, this should remain permanently.  */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 91988ef6727..1a9c2056632 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -68,8 +68,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Some additional system facilities exist.  */
 #define HAVE_PERROR  /* Delete this line for version 6.  */
 
-#define UNEXEC unexhp9k800.o
-
 /* This is how to get the device name of the tty end of a pty.  */
 #define PTY_TTY_NAME_SPRINTF \
             sprintf (pty_name, "/dev/pty/tty%c%x", c, i);
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index e9e14f0cf35..1691daa6615 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -83,8 +83,6 @@ char *_getpty();
 /* Tell process_send_signal to use VSUSP instead of VSWTCH.  */
 #define PREFER_VSUSP
 
-#define UNEXEC unexelf.o
-
 #define NARROWPROTO 1
 
 #define USE_MMAP_FOR_BUFFERS 1
diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h
index afd2d89ae0d..7441eaa0210 100644
--- a/src/s/sol2-10.h
+++ b/src/s/sol2-10.h
@@ -4,20 +4,6 @@
 
 #define SYSTEM_MALLOC
 
-/* Use the Solaris dldump() function, called from unexsol.c, to dump
-   emacs, instead of the generic ELF dump code found in unexelf.c.
-   The resulting binary has a complete symbol table, and is better
-   for debugging and other observability tools (debuggers, pstack, etc).
-
-   If you encounter a problem using dldump(), please consider sending
-   a message to the OpenSolaris tools-linking mailing list:
-        http://mail.opensolaris.org/mailman/listinfo/tools-linking
-
-   It is likely that dldump() works with older Solaris too, but this has
-   not been tested, so for now this change is for Solaris 10 or newer.  */
-#undef UNEXEC
-#define UNEXEC unexsol.o
-
 /* This is used in list_system_processes.  */
 #define HAVE_PROCFS 1
 
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 864ace33d50..9810ab3e67f 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -69,11 +69,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* On USG systems signal handlers return void.  */
 #define SIGTYPE void
 
-/* Undump with ELF.  */
 #undef COFF
 
-#define UNEXEC unexelf.o
-
 /* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct tchars.
    But get <termio.h> first to make sure ttold.h doesn't interfere.
    And don't try to use SIGIO yet.  */