summaryrefslogtreecommitdiffstats
path: root/gettext-runtime/m4
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2007-04-10 17:15:51 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:14:46 +0200
commitf36c700c2b119e6949cd894293043fba2f66ef9f (patch)
tree044c812a26dd86f7792365bb2b05acb66131608d /gettext-runtime/m4
parent4e4e200ed802d97377d7c6bfb123c58e06598977 (diff)
downloadexternal_gettext-f36c700c2b119e6949cd894293043fba2f66ef9f.zip
external_gettext-f36c700c2b119e6949cd894293043fba2f66ef9f.tar.gz
external_gettext-f36c700c2b119e6949cd894293043fba2f66ef9f.tar.bz2
Update from gnulib.
Diffstat (limited to 'gettext-runtime/m4')
-rw-r--r--gettext-runtime/m4/ChangeLog11
-rw-r--r--gettext-runtime/m4/intdiv0.m436
2 files changed, 37 insertions, 10 deletions
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 1f510b3..bbbd042 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -5,6 +5,17 @@
* intl.m4: Remove gt_TYPE_LONGDOUBLE invocation.
* Makefile.am (EXTRA_DIST): Remove longdouble.m4.
+2007-04-02 Bruno Haible <bruno@clisp.org>
+
+ * intdiv0.m4 (gt_INTDIV0): Avoid performing the test for real on x86
+ or x86_64 platforms running MacOS X.
+ Reported by Ryan Schmidt <@ryandesign.com>.
+
+2007-04-02 Bruno Haible <bruno@clisp.org>
+
+ * intdiv0.m4 (gt_INTDIV0): When cross-compiling, treat x86_64 like
+ i386.
+
2007-03-04 Bruno Haible <bruno@clisp.org>
* printf-posix.m4 (gt_PRINTF_POSIX): Treat BeOS like NetBSD and Woe32
diff --git a/gettext-runtime/m4/intdiv0.m4 b/gettext-runtime/m4/intdiv0.m4
index b8865ba..534134a 100644
--- a/gettext-runtime/m4/intdiv0.m4
+++ b/gettext-runtime/m4/intdiv0.m4
@@ -14,7 +14,22 @@ AC_DEFUN([gt_INTDIV0],
AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
gt_cv_int_divbyzero_sigfpe,
[
- AC_TRY_RUN([
+ gt_cv_int_divbyzero_sigfpe=
+changequote(,)dnl
+ case "$host_os" in
+ macos* | darwin[6-9]* | darwin[1-9][0-9]*)
+ # On MacOS X 10.2 or newer, just assume the same as when cross-
+ # compiling. If we were to perform the real test, 1 Crash Report
+ # dialog window would pop up.
+ case "$host_cpu" in
+ i[34567]86 | x86_64)
+ gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
+ esac
+ ;;
+ esac
+changequote([,])dnl
+ if test -z "$gt_cv_int_divbyzero_sigfpe"; then
+ AC_TRY_RUN([
#include <stdlib.h>
#include <signal.h>
@@ -47,17 +62,18 @@ int main ()
exit (1);
}
], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
- [
- # Guess based on the CPU.
+ [
+ # Guess based on the CPU.
changequote(,)dnl
- case "$host_cpu" in
- alpha* | i[34567]86 | m68k | s390*)
- gt_cv_int_divbyzero_sigfpe="guessing yes";;
- *)
- gt_cv_int_divbyzero_sigfpe="guessing no";;
- esac
+ case "$host_cpu" in
+ alpha* | i[34567]86 | x86_64 | m68k | s390*)
+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
+ *)
+ gt_cv_int_divbyzero_sigfpe="guessing no";;
+ esac
changequote([,])dnl
- ])
+ ])
+ fi
])
case "$gt_cv_int_divbyzero_sigfpe" in
*yes) value=1;;