Move setting of NO_MATHERR for Darwin from src/s to configure

* configure.ac (NO_MATHERR): Unconditionally define for Darwin;
as src/s/darwin.h used to.

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

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

diff --git a/configure.ac b/configure.ac
index 1f053a6e7138ce6180edb9aa3b5cd42933fa9d0f..d33e08fadfa478afec158bfc4c2998ff3b54042f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1266,7 +1266,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]],
 [[static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1;]])],
   emacs_cv_struct_exception=yes, emacs_cv_struct_exception=no))
 HAVE_EXCEPTION=$emacs_cv_struct_exception
-if test $emacs_cv_struct_exception != yes; then
+dnl Define on Darwin so emacs symbols will not conflict with those
+dnl in the System framework.  Otherwise -prebind will not work.
+if test $emacs_cv_struct_exception != yes || test $opsys = darwin; then
   AC_DEFINE(NO_MATHERR, 1, [Define to 1 if you don't have struct exception in math.h.])
 fi
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 494f3c89861c627f9683e2a5da5220a8ce09204e..abb9c7bdca929050b321357b7284db9f691bfc5c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
+       * s/darwin.h (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 472f18542192308e6e581a23ab3767f0123b911b..9e6016cc206ebe684dbfece5628f96a812c28ec3 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -82,9 +82,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Do not define abort in emacs.c.  */
 #define NO_ABORT
 
-/* Do not define matherr in floatfns.c.  */
-#define NO_MATHERR
-
 /* 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