Re: Fix fixinclude's configure{,.ac}

[Thomas Schwinge]

Hi!

On Tue, 22 May 2012 11:38:55 +0200, Tristan Gingold  wrote:
> On May 22, 2012, at 11:20 AM, Tobias Burnus wrote:
> > an --enable-maintainers-build fails here with:
> > 
> > configure.ac:99: error: possibly undefined macro: gcc_AC_FUNC_MMAP_BLACKLIST
> >  If this token and others are legitimate, please use m4_pattern_allow.
> >  See the Autoconf documentation.
> > make[3]: *** [fixincludes/configure] Error 1
> > 
> > Looking at Tristan's commit Rev. 186106 of 2012-04-03, the change gcc_ -> 
> > GCC_ is missing. It also looks as if the fixinclude/ config files where not 
> > regenerated, even though there was a later patch by Tristan which touches 
> > fixinclude's config files (Rev. 186759 of 2012-04-24).

I encountered the same issue, and came up with the same fix,
.

> Indeed, I failed to notice that fixinclude was using ../gcc/config.m4.
> 
> I think it would also make sense to remove '-I ../gcc' from ACLOCAL_AMFLAGS 
> of fixincludes/Makefile.in

I agree.

> Thank you for having noticed and fixed this bug,
> Tristan.
> 
> [ Bruce CC as he is the maintained of fixinclude]

Thusly fixed:

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.

diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index b9857b9..92b365c 100644
--- 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 b23541c..7237922 100644
--- 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 ea889b8..4836cd8 100755
--- 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 f1fb2ff..f8f352f 100644
--- 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,


Grüße,
 Thomas


pgpv63WNqNmhE.pgp
Description: PGP signature

Re: Fix fixinclude's configure{,.ac}

[Tristan Gingold]

On May 22, 2012, at 11:20 AM, Tobias Burnus wrote:

> Dear all,
> 
> an --enable-maintainers-build fails here with:
> 
> configure.ac:99: error: possibly undefined macro: gcc_AC_FUNC_MMAP_BLACKLIST
>  If this token and others are legitimate, please use m4_pattern_allow.
>  See the Autoconf documentation.
> make[3]: *** [fixincludes/configure] Error 1
> 
> Looking at Tristan's commit Rev. 186106 of 2012-04-03, the change gcc_ -> 
> GCC_ is missing. It also looks as if the fixinclude/ config files where not 
> regenerated, even though there was a later patch by Tristan which touches 
> fixinclude's config files (Rev. 186759 of 2012-04-24).

Indeed, I failed to notice that fixinclude was using ../gcc/config.m4.

I think it would also make sense to remove '-I ../gcc' from ACLOCAL_AMFLAGS of 
fixincludes/Makefile.in

Thank you for having noticed and fixed this bug,
Tristan.

[ Bruce CC as he is the maintained of fixinclude]

> 
> OK for the trunk? (I think it is really obvious.)
> 
> Tobias
> 

Fix fixinclude's configure{,.ac}

[Tobias Burnus]

Dear all,

an --enable-maintainers-build fails here with:

configure.ac:99: error: possibly undefined macro: gcc_AC_FUNC_MMAP_BLACKLIST
  If this token and others are legitimate, please use m4_pattern_allow.
  See the Autoconf documentation.
make[3]: *** [fixincludes/configure] Error 1

Looking at Tristan's commit Rev. 186106 of 2012-04-03, the change gcc_ 
-> GCC_ is missing. It also looks as if the fixinclude/ config files 
where not regenerated, even though there was a later patch by Tristan 
which touches fixinclude's config files (Rev. 186759 of 2012-04-24).


OK for the trunk? (I think it is really obvious.)

Tobias
fixincludes/
2012-05-22  Tobias Burnus  

	* configure.ac: Use GCC_AC_FUNC_MMAP_BLACKLIST
	instead of gcc_AC_FUNC_MMAP_BLACKLIST.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

diff --git a/fixincludes/configure.ac b/fixincludes/configure.ac
index f1fb2ff..f8f352f 100644
--- 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,
diff --git a/fixincludes/aclocal.m4 b/fixincludes/aclocal.m4
index b23541c..c5d05a3 100644
--- a/fixincludes/aclocal.m4
+++ b/fixincludes/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,6 +13,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 ea889b8..4836cd8 100755
--- 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;;