summaryrefslogtreecommitdiffstats
path: root/gettext-runtime/m4
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2006-05-08 13:33:33 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:13:14 +0200
commit0e2c6c315671deb5473738530ebd4ccda4dd96a1 (patch)
treeba88eb5dfcf170113f2098171586344a5fad6e38 /gettext-runtime/m4
parentedc01386af2d6c85ef21f9a0c2efe098768a5918 (diff)
downloadexternal_gettext-0e2c6c315671deb5473738530ebd4ccda4dd96a1.zip
external_gettext-0e2c6c315671deb5473738530ebd4ccda4dd96a1.tar.gz
external_gettext-0e2c6c315671deb5473738530ebd4ccda4dd96a1.tar.bz2
Fix __builtin_expect detection.
Diffstat (limited to 'gettext-runtime/m4')
-rw-r--r--gettext-runtime/m4/ChangeLog5
-rw-r--r--gettext-runtime/m4/gettext.m44
2 files changed, 7 insertions, 2 deletions
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 2907534..4d8fd6c 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-07 Bruno Haible <bruno@clisp.org>
+
+ * gettext.m4 (gt_INTL_SUBDIR_CORE): Fix test of __builtin_expect so
+ that it works correctly with non-gcc compilers.
+
2006-04-17 Bruno Haible <bruno@clisp.org>
* nls.m4 (AM_MKINSTALLDIRS): Remove macro.
diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index d8e8f0d..e26ce00 100644
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 46 (gettext-0.15)
+# gettext.m4 serial 47 (gettext-0.15)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -492,7 +492,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
AC_REQUIRE([gt_INTTYPES_PRI])dnl
AC_REQUIRE([gl_LOCK])dnl
- AC_TRY_COMPILE(
+ AC_TRY_LINK(
[int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
[],
[AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,