Fix __builtin_expect detection.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 2907534346b658ddf04798dfa90a2a9dba3dca78..4d8fd6c719286a505faa9698b65bea42bb0441a5 100644 (file)
--- 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 d8e8f0dc57e3b91a621d5d941e3655e6c6918eb5..e26ce00a718105175f47f413321a348e519f03cb 100644 (file)
--- 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,