X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fmmap-anon.m4;h=13fbd3c491b51031ef5cae4c1ee6948b50bd932e;hb=74f8d5870e0fd68701ff379775a5f0a439bfb5b3;hp=6093567f7885c30034e90792ac1a1b62d8e5241f;hpb=c49424557579cb46914ba4f080720d8b94abab39;p=gnulib.git

diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 6093567f7..13fbd3c49 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -1,17 +1,17 @@
-# mmap-anon.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# mmap-anon.m4 serial 4
+dnl Copyright (C) 2005, 2007 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.
 
-AC_DEFUN([gl_FUNC_MMAP],
+AC_DEFUN([gl_FUNC_MMAP_ANON],
 [
   dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
   AC_REQUIRE([AC_PROG_CPP])
   AC_REQUIRE([AC_PROG_EGREP])
 
   dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   # Check for mmap()
   AC_FUNC_MMAP
@@ -27,8 +27,8 @@ AC_DEFUN([gl_FUNC_MMAP],
 #endif
 ],
       [gl_have_mmap_anonymous=yes])
-    if test $gl_have_mmap_anonymous = no; then
-      AC_EGREP_HEADER([MAP_ANON], [
+    if test $gl_have_mmap_anonymous != yes; then
+      AC_EGREP_CPP([I cant identify this map.], [
 #include <sys/mman.h>
 #ifdef MAP_ANON
     I cant identify this map.
@@ -44,11 +44,5 @@ AC_DEFUN([gl_FUNC_MMAP],
         [Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
          config.h and <sys/mman.h>.])
     fi
-
-    AH_VERBATIM([MAP_FILE],
-[/* Define MAP_FILE when it isn't otherwise.  */
-#ifndef MAP_FILE
-# define MAP_FILE 0
-#endif])
   fi
 ])