diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-10-10 17:23:04 +0100 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2013-10-12 09:38:39 -0400 |
| commit | 72fdc868b56fe2b7bdc9a69872651baeca728fb6 (patch) | |
| tree | 5ec0a5bd36e0e75c5d4852278ca596dfa2a9c26c | |
| parent | 52ed34418492c1538b8022a830a79fbc50ba3605 (diff) | |
| download | xorg-util-macros-72fdc868b56fe2b7bdc9a69872651baeca728fb6.tar.gz | |
xorg-macros.m4.in: use the autoconf cache for XORG_CHECK_MALLOC_ZERO
Improve configure speed by checking the autoconf cache before compiling and
running the test.
As this means cross-compilation environments can trivially seed this cache as
appropriate, remove the cross-compiling value (which for embedded systems using
uclibc is wrong).
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | xorg-macros.m4.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 18c33e9..2788f8f 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -1320,7 +1320,8 @@ AC_ARG_ENABLE(malloc0returnsnull, AC_MSG_CHECKING([whether malloc(0) returns NULL]) if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then - AC_RUN_IFELSE([AC_LANG_PROGRAM([ +AC_CACHE_VAL([xorg_cv_malloc0_returns_null], + [AC_RUN_IFELSE([AC_LANG_PROGRAM([ #include <stdlib.h> ],[ char *m0, *r0, *c0, *p; @@ -1330,9 +1331,9 @@ if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then c0 = calloc(0,10); exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1); ])], - [MALLOC_ZERO_RETURNS_NULL=yes], - [MALLOC_ZERO_RETURNS_NULL=no], - [MALLOC_ZERO_RETURNS_NULL=yes]) + [xorg_cv_malloc0_returns_null=yes], + [xorg_cv_malloc0_returns_null=no])]) +MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null fi AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) |