From: Glenn Morris <rgm@gnu.org>
Date: Thu, 12 Jul 2012 01:14:56 +0000 (-0400)
Subject: Move NO_ABORT from src/s to configure
X-Git-Tag: emacs-24.2.90~1199^2~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5564388a3d737538a48a202b9668cefa776794d;p=emacs.git

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 92ef76d4ef7..d6882a8fe0b 100644
--- 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 d33e08fadfa..a6d3851836b 100644
--- 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 abb9c7bdca9..f53b9a212c8 100644
--- 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 9e6016cc206..548e3b4779e 100644
--- 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