diff options
| author | Guido Günther <agx@sigxcpu.org> | 2014-05-02 11:06:08 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-05-02 11:06:08 +0200 |
| commit | 1190eb8d003c872dcb203f9e3dade0c92f14cc9c (patch) | |
| tree | bd6c409ad3615c381004bc7c2a6b69b48a9e649d /m4 | |
| parent | cca8c1eae0ec5a881e37fa3dfc49981de1fd5900 (diff) | |
New upstream version 1.2.4~rc2
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 9 | ||||
| -rw-r--r-- | m4/physmem.m4 | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 32d5b9e62..0f1cd1694 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -233,8 +233,6 @@ AC_DEFUN([gl_EARLY], # Code from module lstat: # Code from module lstat-tests: # Code from module maintainer-makefile: - # Code from module malloc-gnu: - # Code from module malloc-gnu-tests: # Code from module malloc-posix: # Code from module malloca: # Code from module malloca-tests: @@ -810,11 +808,6 @@ AC_SUBST([LTALLOCA]) AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER], [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])]) AC_REQUIRE([AC_PROG_SED]) - gl_FUNC_MALLOC_GNU - if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) - fi - gl_MODULE_INDICATOR([malloc-gnu]) gl_FUNC_MALLOC_POSIX if test $REPLACE_MALLOC = 1; then AC_LIBOBJ([malloc]) @@ -1664,7 +1657,6 @@ AC_DEFUN([gltests_LIBSOURCES], [ # gnulib-tool and may be removed by future gnulib-tool invocations. AC_DEFUN([gl_FILE_LIST], [ build-aux/config.rpath - build-aux/git-log-fix build-aux/gitlog-to-changelog build-aux/mktempd build-aux/snippet/_Noreturn.h @@ -2303,7 +2295,6 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-lseek.sh tests/test-lstat.c tests/test-lstat.h - tests/test-malloc-gnu.c tests/test-malloca.c tests/test-math.c tests/test-mbrtowc-w32-1.sh diff --git a/m4/physmem.m4 b/m4/physmem.m4 index ff3d268e3..a1179eb33 100644 --- a/m4/physmem.m4 +++ b/m4/physmem.m4 @@ -40,6 +40,7 @@ AC_DEFUN([gl_PHYSMEM], #endif ]) - AC_CHECK_FUNCS([pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table]) + AC_CHECK_FUNCS([pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table sysinfo]) + AC_CHECK_MEMBERS([struct sysinfo.mem_unit],,, [[#include <sys/sysinfo.h>]]) AC_REQUIRE([gl_SYS__SYSTEM_CONFIGURATION]) ]) |