1
0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-08 17:22:05 +03:00

malloc-*: Move AC_LIBOBJ invocations to module description.

* m4/malloc.m4 (gl_REPLACE_MALLOC): Remove macro.
(gl_FUNC_MALLOC_GNU, gl_FUNC_MALLOC_POSIX): Inline it here. Move
AC_LIBOBJ invocations from here...
* modules/malloc-gnu (configure.ac): ... to here.
* modules/malloc-posix (configure.ac): ... and here.
This commit is contained in:
Bruno Haible
2011-05-21 14:10:51 +02:00
parent 15fe5bb631
commit 4e90ef85d2
4 changed files with 18 additions and 9 deletions

View File

@@ -1,3 +1,12 @@
2011-05-21 Bruno Haible <bruno@clisp.org>
malloc-*: Move AC_LIBOBJ invocations to module description.
* m4/malloc.m4 (gl_REPLACE_MALLOC): Remove macro.
(gl_FUNC_MALLOC_GNU, gl_FUNC_MALLOC_POSIX): Inline it here. Move
AC_LIBOBJ invocations from here...
* modules/malloc-gnu (configure.ac): ... to here.
* modules/malloc-posix (configure.ac): ... and here.
2011-05-21 Bruno Haible <bruno@clisp.org> 2011-05-21 Bruno Haible <bruno@clisp.org>
lstat, openat: Respect rules for use of AC_LIBOBJ. lstat, openat: Respect rules for use of AC_LIBOBJ.

View File

@@ -1,4 +1,4 @@
# malloc.m4 serial 12 # malloc.m4 serial 13
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_MALLOC_GNU],
[Define to 1 if your system has a GNU libc compatible 'malloc' [Define to 1 if your system has a GNU libc compatible 'malloc'
function, and to 0 otherwise.])], function, and to 0 otherwise.])],
[AC_DEFINE([HAVE_MALLOC_GNU], [0]) [AC_DEFINE([HAVE_MALLOC_GNU], [0])
gl_REPLACE_MALLOC REPLACE_MALLOC=1
]) ])
]) ])
@@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_MALLOC_POSIX],
AC_DEFINE([HAVE_MALLOC_POSIX], [1], AC_DEFINE([HAVE_MALLOC_POSIX], [1],
[Define if the 'malloc' function is POSIX compliant.]) [Define if the 'malloc' function is POSIX compliant.])
else else
gl_REPLACE_MALLOC REPLACE_MALLOC=1
fi fi
]) ])
@@ -58,9 +58,3 @@ AC_DEFUN([gl_CHECK_MALLOC_POSIX],
[gl_cv_func_malloc_posix=no]) [gl_cv_func_malloc_posix=no])
]) ])
]) ])
AC_DEFUN([gl_REPLACE_MALLOC],
[
AC_LIBOBJ([malloc])
REPLACE_MALLOC=1
])

View File

@@ -14,6 +14,9 @@ malloc-posix
configure.ac: configure.ac:
gl_FUNC_MALLOC_GNU gl_FUNC_MALLOC_GNU
if test $REPLACE_MALLOC = 1; then
AC_LIBOBJ([malloc])
fi
gl_MODULE_INDICATOR([malloc-gnu]) gl_MODULE_INDICATOR([malloc-gnu])
Makefile.am: Makefile.am:

View File

@@ -10,6 +10,9 @@ stdlib
configure.ac: configure.ac:
gl_FUNC_MALLOC_POSIX gl_FUNC_MALLOC_POSIX
if test $REPLACE_MALLOC = 1; then
AC_LIBOBJ([malloc])
fi
gl_STDLIB_MODULE_INDICATOR([malloc-posix]) gl_STDLIB_MODULE_INDICATOR([malloc-posix])
Makefile.am: Makefile.am: