diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/strtoumax.m4 | 6 | ||||
| -rw-r--r-- | modules/strtoumax | 8 |
3 files changed, 15 insertions, 7 deletions
@@ -1,5 +1,13 @@ 2011-09-01 Bruno Haible <bruno@clisp.org> + strtoumax: Avoid link error on OSF/1 with DTK cc. + * m4/strtoumax.m4 (gl_FUNC_STRTOUMAX): Always test whether strtoumax is + defined as a function. + * modules/strtoumax (Depends-on, configure.ac): Test only whether + strtoumax is defined, not whether it is declared. + +2011-09-01 Bruno Haible <bruno@clisp.org> + strtoimax: Avoid link error on OSF/1 with DTK cc. * m4/strtoimax.m4 (gl_FUNC_STRTOIMAX): Always test whether strtoimax is defined as a function. diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index 58b310de85..1ddf6820e3 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,4 +1,4 @@ -# strtoumax.m4 serial 10 +# strtoumax.m4 serial 11 dnl Copyright (C) 2002-2004, 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, @@ -8,11 +8,11 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], [ 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([strtoumax]) AC_CHECK_DECLS_ONCE([strtoumax]) if test "$ac_cv_have_decl_strtoumax" != yes; then HAVE_DECL_STRTOUMAX=0 - - AC_CHECK_FUNCS([strtoumax]) fi ]) diff --git a/modules/strtoumax b/modules/strtoumax index 5520f0d43b..dc72a0aac4 100644 --- a/modules/strtoumax +++ b/modules/strtoumax @@ -9,13 +9,13 @@ m4/strtoumax.m4 Depends-on: inttypes-incomplete -verify [test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no] -stdint [test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no] -strtoull [test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes] +verify [test $ac_cv_func_strtoumax = no] +stdint [test $ac_cv_func_strtoumax = no] +strtoull [test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes] configure.ac: gl_FUNC_STRTOUMAX -if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no; then +if test $ac_cv_func_strtoumax = no; then AC_LIBOBJ([strtoumax]) gl_PREREQ_STRTOUMAX fi |