From b34698eb8843377024315f407ec63ba67c82b686 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 2 Sep 2011 01:32:05 +0200 Subject: [PATCH] imaxabs: Avoid link error on OSF/1 with DTK cc. (cherry picked from commit 7c712d9b74453214bc029ebcb12f6f2a00f68bbc) --- ChangeLog | 8 ++++++++ m4/imaxabs.m4 | 5 ++++- modules/imaxabs | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a66129a0e..c721cbfca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 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. + * modules/imaxabs (configure.ac): Test whether imaxabs is defined, not + whether it is declared. + +2011-09-01 Bruno Haible + pthread: Determine $(LIB_PTHREAD) correctly on IRIX 6.5. * m4/pthread.m4 (gl_PTHREAD_CHECK): Check for pthread_join, not pthread_create. diff --git a/m4/imaxabs.m4 b/m4/imaxabs.m4 index 58e5ac853..294b8f57d 100644 --- a/m4/imaxabs.m4 +++ b/m4/imaxabs.m4 @@ -1,4 +1,4 @@ -# imaxabs.m4 serial 3 +# imaxabs.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_IMAXABS], [ 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([imaxabs]) AC_CHECK_DECLS_ONCE([imaxabs]) if test "$ac_cv_have_decl_imaxabs" != yes; then HAVE_DECL_IMAXABS=0 diff --git a/modules/imaxabs b/modules/imaxabs index 58a229efc..630c00d97 100644 --- a/modules/imaxabs +++ b/modules/imaxabs @@ -10,7 +10,7 @@ inttypes-incomplete configure.ac: gl_FUNC_IMAXABS -if test $HAVE_DECL_IMAXABS = 0; then +if test $ac_cv_func_imaxabs = no; then AC_LIBOBJ([imaxabs]) gl_PREREQ_IMAXABS fi -- 2.11.0