-# calloc.m4 serial 6
+# calloc.m4 serial 9
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004-2010 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# If so, define HAVE_CALLOC. Otherwise, define calloc to rpl_calloc
# and arrange to use a calloc wrapper function that does work in that case.
-# _AC_FUNC_CALLOC_IF(IF-WORKS, IF-NOT)
+# _AC_FUNC_CALLOC_IF([IF-WORKS], [IF-NOT])
# -------------------------------------
# If `calloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT.
AC_DEFUN([_AC_FUNC_CALLOC_IF],
[AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull,
+AC_CACHE_CHECK([for GNU libc compatible calloc], [ac_cv_func_calloc_0_nonnull],
[AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
- [exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));])],
- [ac_cv_func_calloc_0_nonnull=yes],
- [ac_cv_func_calloc_0_nonnull=no],
- [ac_cv_func_calloc_0_nonnull=no])])
+ [[exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));]])],
+ [ac_cv_func_calloc_0_nonnull=yes],
+ [ac_cv_func_calloc_0_nonnull=no],
+ [ac_cv_func_calloc_0_nonnull=no])])
AS_IF([test $ac_cv_func_calloc_0_nonnull = yes], [$1], [$2])
])# AC_FUNC_CALLOC
# needed.
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_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
+
+
+# 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_CHECK_MALLOC_POSIX])
+ if test $gl_cv_func_malloc_posix = yes; then
+ HAVE_CALLOC_POSIX=1
+ AC_DEFINE([HAVE_CALLOC_POSIX], [1],
+ [Define if the 'calloc' function is POSIX compliant.])
+ else
+ AC_LIBOBJ([calloc])
+ HAVE_CALLOC_POSIX=0
+ fi
+ AC_SUBST([HAVE_CALLOC_POSIX])
+])