projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
m4
/
xstrtoumax.m4
diff --git
a/m4/xstrtoumax.m4
b/m4/xstrtoumax.m4
index
f6e3199
..
523ebe0
100644
(file)
--- a/
m4/xstrtoumax.m4
+++ b/
m4/xstrtoumax.m4
@@
-1,12
+1,14
@@
-#serial
2
+#serial
3
# autoconf tests required for use of xstrtoumax.c
AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
[
# autoconf tests required for use of xstrtoumax.c
AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
[
+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
- AC_CHECK_HEADERS(stdlib.h)
+ AC_CHECK_DECLS([strtoul, strtoull])
+ AC_CHECK_HEADERS(limits.h stdlib.h)
AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
jm_cv_func_strtoumax_macro,
AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
jm_cv_func_strtoumax_macro,
@@
-27,7
+29,13
@@
AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
dnl so we need the replacement strtoull only if strtoumax does not exist.
case "$ac_cv_type_unsigned_long_long,$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
yes,no,no)
dnl so we need the replacement strtoull only if strtoumax does not exist.
case "$ac_cv_type_unsigned_long_long,$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
yes,no,no)
- AC_REPLACE_FUNCS(strtoull)
+ AC_REPLACE_FUNCS(strtoull strtol)
+ ;;
+ esac
+
+ case "$jm_cv_func_strtoumax_macro,$ac_cv_func_strtoumax" in
+ no,no)
+ AC_REPLACE_FUNCS(strtoul strtol)
;;
esac
;;
esac