configure.ac: Use GCC_AC_FUNC_MMAP_BLACKLIST instead of gcc_AC_FUNC_MMAP_BLACKLIST.

fixincludes/
	* configure.ac: Use GCC_AC_FUNC_MMAP_BLACKLIST instead of
	gcc_AC_FUNC_MMAP_BLACKLIST.
	* Makefile.in (ACLOCAL_AMFLAGS): Don't include ../gcc.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r187984

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 690fd4f7307db6f770a11b8bf8c024346e6099a2..ea201c3080cd0fcba06527e528f408678cd90285 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-29  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * configure.ac: Use GCC_AC_FUNC_MMAP_BLACKLIST instead of
+       gcc_AC_FUNC_MMAP_BLACKLIST.
+       * Makefile.in (ACLOCAL_AMFLAGS): Don't include ../gcc.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+
 2012-04-24  Tristan Gingold  <gingold@adacore.com>
 
        * fixincl.c (fix_with_system): Add missing specifier.

diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index b9857b9579f56fb45d5d1d2b221150d7eb8ead28..92b365cc0f9af18a676730396559e14301bef4dc 100644 (file)
--- a/fixincludes/Makefile.in
+++ b/fixincludes/Makefile.in
@@ -66,7 +66,7 @@ mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs
 AUTOCONF = autoconf
 AUTOHEADER = autoheader
 ACLOCAL = aclocal
-ACLOCAL_AMFLAGS = -I ../gcc -I .. -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config
 
 default : all
 

diff --git a/fixincludes/aclocal.m4 b/fixincludes/aclocal.m4
index b23541c34bf73de76a1c45420e104bce0fe48849..7237922aa9db51527f21b7ec792aaa1941bb3a64 100644 (file)
--- a/fixincludes/aclocal.m4
+++ b/fixincludes/aclocal.m4
@@ -12,6 +12,6 @@
 # PARTICULAR PURPOSE.
 
 m4_include([../config/acx.m4])
+m4_include([../config/mmap.m4])
 m4_include([../config/override.m4])
 m4_include([../config/warnings.m4])
-m4_include([../gcc/acinclude.m4])

diff --git a/fixincludes/configure b/fixincludes/configure
index ea889b80f0f233d45fa1248aabdd7338a73c4414..4836cd886537e9cdf73ef2bb064bfa581fc1068a 100755 (executable)
--- a/fixincludes/configure
+++ b/fixincludes/configure
@@ -5222,7 +5222,7 @@ else
    # read() to the same fd.  The only system known to have a problem here
    # is VMS, where text files have record structure.
    case "$host_os" in
-     vms* | ultrix*)
+     *vms* | ultrix*)
         gcc_cv_func_mmap_file=no ;;
      *)
         gcc_cv_func_mmap_file=yes;;
@@ -5246,7 +5246,7 @@ else
    # Systems known to be in this category are Windows (all variants),
    # VMS, and Darwin.
    case "$host_os" in
-     vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
+     *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00)
         gcc_cv_func_mmap_dev_zero=no ;;
      *)
         gcc_cv_func_mmap_dev_zero=yes;;
@@ -5303,7 +5303,7 @@ else
    # above for use of /dev/zero.
    # Systems known to be in this category are Windows, VMS, and SCO Unix.
    case "$host_os" in
-     vms* | cygwin* | pe | mingw* | sco* | udk* )
+     *vms* | cygwin* | pe | mingw* | sco* | udk* )
         gcc_cv_func_mmap_anon=no ;;
      *)
         gcc_cv_func_mmap_anon=yes;;

diff --git a/fixincludes/configure.ac b/fixincludes/configure.ac
index f1fb2ff4e56adedd97d760d721c10e4380bdccd1..f8f352fb7153445782727eb3311d4305f33fa260 100644 (file)
--- a/fixincludes/configure.ac
+++ b/fixincludes/configure.ac
@@ -96,7 +96,7 @@ AC_CHECK_DECLS(m4_split(m4_normalize(fixincludes_UNLOCKED_FUNCS)))
 AC_C_CONST
 
 # Checks for library functions.
-gcc_AC_FUNC_MMAP_BLACKLIST
+GCC_AC_FUNC_MMAP_BLACKLIST
 
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 AC_ARG_ENABLE(maintainer-mode,