Backport r1875062

Add a cache check with which users who cross-compile APR
can influence the outcome of the /dev/zero test by setting the variable
ac_cv_mmap__dev_zero=yes


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1875064 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 9 insertions, 7 deletions

diff --git a/CHANGES b/CHANGES
index 9c9646783..4ff472a83 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.7.1
 
+  *) Add a cache check with which users who cross-compile APR
+     can influence the outcome of the /dev/zero test by setting the variable
+     ac_cv_mmap__dev_zero=yes [Sebastian Kemper <sebastian_ml gmx net>]
+
   *) Trick autoconf into printing the correct default prefix in the help.
      [Stefan Fritsch]
 
diff --git a/configure.in b/configure.in
index b6f0f2561..3566a5464 100644
--- a/configure.in
+++ b/configure.in
@@ -1188,10 +1188,10 @@ AC_CHECK_FILE(/dev/zero)
 
 # Not all systems can mmap /dev/zero (such as HP-UX).  Check for that.
 if test "$ac_cv_func_mmap" = "yes" &&
-   test "$ac_cv_file__dev_zero" = "yes"; then
-    AC_MSG_CHECKING(for mmap that can map /dev/zero)
-    AC_TRY_RUN([
-#include <sys/types.h>
+  test "$ac_cv_file__dev_zero" = "yes"; then
+    AC_CACHE_CHECK([for mmap that can map /dev/zero],
+    [ac_cv_mmap__dev_zero],
+    [AC_TRY_RUN([#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #ifdef HAVE_SYS_MMAN_H
@@ -1213,9 +1213,7 @@ if test "$ac_cv_func_mmap" = "yes" &&
             return 3;
         }
         return 0;
-    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
-
-    AC_MSG_RESULT($ac_cv_file__dev_zero)
+    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])])
 fi
 
 # Now we determine which one is our anonymous shmem preference.