* lib/autoconf/functions.m4 (AC_FUNC_MMAP): #Undef malloc.

diff --git a/ChangeLog b/ChangeLog
index a6317d88bab82bd7d46e464c69343c4a732019ba..1b6cfa46e043b28124550111d32fb00b8085bd9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-21  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/functions.m4 (AC_FUNC_MMAP): #Undef malloc.
+
 2002-01-21  Akim Demaille  <akim@epita.fr>
 
        * lib/Autom4te/General.pm (getopt): Use a more GNUish error

diff --git a/TODO b/TODO
index d68e3c51d3d72e55fedcb81f6fe653d10cd768a6..afb03c35aa9c123eb674248df4ec2bee34d6efcf 100644 (file)
--- a/TODO
+++ b/TODO
@@ -23,6 +23,16 @@ Write a test that checks that it honors the values set by the user.
 ** autom4te and warnings.
 Decide what must be done.
 
+** AC_DEFINE(func, rpl_func)
+This scheme causes problems: if for instance, #define malloc
+rpl_malloc, then the rest of configure will use an undefined malloc.
+Hence some tests fail.  Up to now we simply #undef these functions
+where we had a problem (cf. AC_FUNC_MKTIME and AC_FUNC_MMAP for
+instance).  This is _bad_.  Maybe the #define func rpl_malloc should
+be performed in another file than confdefs.h, say confh.h, which is
+used for config.h generation, but not used in configure's own tests.
+
+
 ** Automake 1.6
 *** AC_LIBOBJ_DECL
 Decide with the Automake team whether this macro should list only `.c'

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index a8e12cd29e599a96d0f5786a867d69c381f9c9e9..1adfaeb83b073a1a32f333ffaeb67d0b21d9bfc3 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -888,7 +888,10 @@ AC_DEFUN([AC_FUNC_MMAP],
 AC_CHECK_FUNCS(getpagesize)
 AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([AC_INCLUDES_DEFAULT]
-[[/* Thanks to Mike Haertel and Jim Avera for this test.
+[[/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
    Here is a matrix of mmap possibilities:
        mmap private not fixed
        mmap private fixed at somewhere currently unmapped