From 6add58a9a1e2531ac96079cc063201ef3b3c2b98 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 2 Sep 2011 01:33:11 +0200 Subject: [PATCH] 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. (cherry picked from commit d828cda5d7eebb7daa2da7b4e717be1e0883940b) --- ChangeLog | 8 ++++++++ m4/imaxdiv.m4 | 5 ++++- modules/imaxdiv | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c721cbfca..37dae773a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-09-01 Bruno Haible + 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 + 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 -- 2.11.0