X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmmap-anon.m4;h=a6b7b9ac3b4954a5603f27408b2f5b3c3e90b61b;hb=062cad2d07081f9a60adbb90fc1184a435a1a93f;hp=91cd95b232862850cad26daa3732ce8902ab4aab;hpb=35684203ea9951bc0634065e7ae2120fc8372591;p=gnulib.git

diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 91cd95b23..a6b7b9ac3 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -1,5 +1,5 @@
-# mmap-anon.m4 serial 6
-dnl Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+# mmap-anon.m4 serial 8
+dnl Copyright (C) 2005, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -20,14 +20,16 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
   AC_REQUIRE([AC_PROG_EGREP])
 
   dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
-  # Check for mmap()
-  AC_FUNC_MMAP
+  # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
+  # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
+  # irrelevant for anonymous mappings.
+  AC_CHECK_FUNC([mmap], [gl_have_mmap=yes], [gl_have_mmap=no])
 
   # Try to allow MAP_ANONYMOUS.
   gl_have_mmap_anonymous=no
-  if test $ac_cv_func_mmap_fixed_mapped = yes; then
+  if test $gl_have_mmap = yes; then
     AC_MSG_CHECKING([for MAP_ANONYMOUS])
     AC_EGREP_CPP([I cant identify this map.], [
 #include <sys/mman.h>