From: Bruno Haible <bruno@clisp.org>
Date: Thu, 1 Sep 2011 23:33:11 +0000 (+0200)
Subject: imaxdiv: Avoid link error on OSF/1 with DTK cc.
X-Git-Tag: v0.1~1971
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=d828cda;p=gnulib.git

imaxdiv: Avoid link error on OSF/1 with DTK cc.

* m4/imaxdiv.m4 (gl_FUNC_IMAXDIV): Also test whether imaxdiv is defined
as a function.
* modules/imaxdiv (configure.ac): Test whether imaxdiv is defined, not
whether it is declared.
---

diff --git a/ChangeLog b/ChangeLog
index da9c7c2cc..41bcc813d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-09-01  Bruno Haible  <bruno@clisp.org>
 
+	imaxdiv: Avoid link error on OSF/1 with DTK cc.
+	* m4/imaxdiv.m4 (gl_FUNC_IMAXDIV): Also test whether imaxdiv is defined
+	as a function.
+	* modules/imaxdiv (configure.ac): Test whether imaxdiv is defined, not
+	whether it is declared.
+
+2011-09-01  Bruno Haible  <bruno@clisp.org>
+
 	imaxabs: Avoid link error on OSF/1 with DTK cc.
 	* m4/imaxabs.m4 (gl_FUNC_IMAXABS): Also test whether imaxabs is defined
 	as a function.
diff --git a/m4/imaxdiv.m4 b/m4/imaxdiv.m4
index 57ceaa82d..a8a580297 100644
--- a/m4/imaxdiv.m4
+++ b/m4/imaxdiv.m4
@@ -1,4 +1,4 @@
-# imaxdiv.m4 serial 3
+# imaxdiv.m4 serial 4
 dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,6 +7,9 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_IMAXDIV],
 [
   AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
+
+  dnl On OSF/1 5.1 with cc, this function is declared but not defined.
+  AC_CHECK_FUNCS_ONCE([imaxdiv])
   AC_CHECK_DECLS_ONCE([imaxdiv])
   if test "$ac_cv_have_decl_imaxdiv" != yes; then
     HAVE_DECL_IMAXDIV=0
diff --git a/modules/imaxdiv b/modules/imaxdiv
index 2ad32eb63..6ac081edb 100644
--- a/modules/imaxdiv
+++ b/modules/imaxdiv
@@ -10,7 +10,7 @@ inttypes-incomplete
 
 configure.ac:
 gl_FUNC_IMAXDIV
-if test $HAVE_DECL_IMAXDIV = 0; then
+if test $ac_cv_func_imaxdiv = no; then
   AC_LIBOBJ([imaxdiv])
   gl_PREREQ_IMAXDIV
 fi