Move NO_ABORT from src/s to configure

* configure.ac (NO_ABORT): Move here from src/s.

* src/s/darwin.h (NO_ABORT): Let configure set it.

diff --git a/ChangeLog b/ChangeLog
index 92ef76d4ef793de011f4fc76836cdcf0e4a5cef2..d6882a8fe0b899801c0827eebf782af62b88c0cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
        * configure.ac (NO_MATHERR): Unconditionally define for Darwin;
        as src/s/darwin.h used to.
 
-       * configure.ac (NARROWPROTO): Move here from src/s.
+       * configure.ac (NARROWPROTO, NO_ABORT): Move here from src/s.
 
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 

diff --git a/configure.ac b/configure.ac
index d33e08fadfa478afec158bfc4c2998ff3b54042f..a6d3851836bbeb283f99bf3f53750634d87eb34f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3157,7 +3157,13 @@ dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
 case $opsys in
   hpux* | irix6-5 | openbsd | sol2* | unixware )
     AC_DEFINE(BROKEN_SIGIO, 1, [Define if SIGIO should not be used.])
-  ;;
+    ;;
+
+  dnl Define the following so emacs symbols will not conflict with those
+  dnl in the System framework.  Otherwise -prebind will not work.
+  darwin)
+    AC_DEFINE(NO_ABORT, 1, [Do not define abort in emacs.c.])
+    ;;
 esac
 
 case $opsys in

diff --git a/src/ChangeLog b/src/ChangeLog
index abb9c7bdca929050b321357b7284db9f691bfc5c..f53b9a212c8ccc59b529fdd902f3eb0ad98fd659 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
-       * s/darwin.h (NO_MATHERR): Let configure set it.
+       * s/darwin.h (NO_ABORT, NO_MATHERR): Let configure set it.
 
        * s/bsd-common.h, s/cygwin.h, s/gnu-linux.h, s/irix6-5.h:
        * s/template.h: Move NARROWPROTO to configure.

diff --git a/src/s/darwin.h b/src/s/darwin.h
index 9e6016cc206ebe684dbfece5628f96a812c28ec3..548e3b4779ed133731d38073ef1f8f6a102a1a96 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -76,12 +76,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_POSIX_MEMALIGN
 #endif
 
-/* Define the following so emacs symbols will not conflict with those
-   in the System framework.  Otherwise -prebind will not work.  */
-
-/* Do not define abort in emacs.c.  */
-#define NO_ABORT
-
 /* The following solves the problem that Emacs hangs when evaluating
    (make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile
    does not exist.  Also, setsid is not allowed in the vfork child's