-AC_DEFUN([AC_FUNC_CALLOC],
-[_AC_FUNC_CALLOC_IF(
- [AC_DEFINE([HAVE_CALLOC], 1,
- [Define to 1 if your system has a GNU libc compatible `calloc'
- function, and to 0 otherwise.])],
- [AC_DEFINE([HAVE_CALLOC], 0)
- AC_LIBOBJ([calloc])
- AC_DEFINE([calloc], [rpl_calloc],
- [Define to rpl_calloc if the replacement function should be used.])])
-])# AC_FUNC_CALLOC
+AC_DEFUN([gl_FUNC_CALLOC_GNU],
+[
+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+ _AC_FUNC_CALLOC_IF(
+ [AC_DEFINE([HAVE_CALLOC_GNU], [1],
+ [Define to 1 if your system has a GNU libc compatible 'calloc'
+ function, and to 0 otherwise.])],
+ [AC_DEFINE([HAVE_CALLOC_GNU], [0])
+ REPLACE_CALLOC=1
+ ])
+])# gl_FUNC_CALLOC_GNU
+
+
+# gl_FUNC_CALLOC_POSIX
+# --------------------
+# Test whether 'calloc' is POSIX compliant (sets errno to ENOMEM when it
+# fails), and replace calloc if it is not.
+AC_DEFUN([gl_FUNC_CALLOC_POSIX],
+[
+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+ AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
+ if test $gl_cv_func_malloc_posix = yes; then
+ AC_DEFINE([HAVE_CALLOC_POSIX], [1],
+ [Define if the 'calloc' function is POSIX compliant.])
+ else
+ REPLACE_CALLOC=1
+ fi
+])