config/
* extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Do not expand for Autoconf 2.62 or newer. * tls.m4 (GCC_CHECK_TLS): Fix m4 quotation. * no-executables.m4 (_AC_COMPILER_EXEEXT): Fix m4 quotation. * override.m4 (m4_copy_force, m4_rename_force): Provide macros if not defined. (AC_PREREQ): Use m4_copy_force. readline/examples/rlfe/ * configure.in: Correctly quote AC_PROGRAM_SOURCE definition.
This commit is contained in:
		| @@ -1,3 +1,13 @@ | |||||||
|  | 2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de> | ||||||
|  |  | ||||||
|  | 	* extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Do not expand | ||||||
|  | 	for Autoconf 2.62 or newer. | ||||||
|  | 	* tls.m4 (GCC_CHECK_TLS): Fix m4 quotation. | ||||||
|  | 	* no-executables.m4 (_AC_COMPILER_EXEEXT): Fix m4 quotation. | ||||||
|  | 	* override.m4 (m4_copy_force, m4_rename_force): Provide | ||||||
|  | 	macros if not defined. | ||||||
|  | 	(AC_PREREQ): Use m4_copy_force. | ||||||
|  |  | ||||||
| 2009-07-17  Joseph Myers  <joseph@codesourcery.com> | 2009-07-17  Joseph Myers  <joseph@codesourcery.com> | ||||||
|  |  | ||||||
| 	PR other/40784 | 	PR other/40784 | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| # serial 5  -*- Autoconf -*- | # serial 6  -*- Autoconf -*- | ||||||
| # Enable extensions on systems that normally disable them. | # Enable extensions on systems that normally disable them. | ||||||
|  |  | ||||||
| # Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc. | # Copyright (C) 2003, 2006, 2007, 2009 Free Software Foundation, Inc. | ||||||
| # This file is free software; the Free Software Foundation | # This file is free software; the Free Software Foundation | ||||||
| # gives unlimited permission to copy and/or distribute it, | # gives unlimited permission to copy and/or distribute it, | ||||||
| # with or without modifications, as long as this notice is preserved. | # with or without modifications, as long as this notice is preserved. | ||||||
| @@ -12,6 +12,8 @@ | |||||||
| # enough in this area it's likely we'll need to redefine | # enough in this area it's likely we'll need to redefine | ||||||
| # AC_USE_SYSTEM_EXTENSIONS for quite some time. | # AC_USE_SYSTEM_EXTENSIONS for quite some time. | ||||||
|  |  | ||||||
|  | m4_version_prereq([2.62],, [ | ||||||
|  |  | ||||||
| # AC_USE_SYSTEM_EXTENSIONS | # AC_USE_SYSTEM_EXTENSIONS | ||||||
| # ------------------------ | # ------------------------ | ||||||
| # Enable extensions on systems that normally disable them, | # Enable extensions on systems that normally disable them, | ||||||
| @@ -74,3 +76,4 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl | |||||||
|   AC_DEFINE([_TANDEM_SOURCE]) |   AC_DEFINE([_TANDEM_SOURCE]) | ||||||
| ])# AC_USE_SYSTEM_EXTENSIONS | ])# AC_USE_SYSTEM_EXTENSIONS | ||||||
|  |  | ||||||
|  | ]) | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ AC_BEFORE([$0], [_AC_COMPILER_EXEEXT]) | |||||||
| AC_BEFORE([$0], [AC_LINK_IFELSE]) | AC_BEFORE([$0], [AC_LINK_IFELSE]) | ||||||
|  |  | ||||||
| m4_define([_AC_COMPILER_EXEEXT], | m4_define([_AC_COMPILER_EXEEXT], | ||||||
| AC_LANG_CONFTEST([AC_LANG_PROGRAM()]) | [AC_LANG_CONFTEST([AC_LANG_PROGRAM()]) | ||||||
| # FIXME: Cleanup? | # FIXME: Cleanup? | ||||||
| AS_IF([AC_TRY_EVAL(ac_link)], [gcc_no_link=no], [gcc_no_link=yes]) | AS_IF([AC_TRY_EVAL(ac_link)], [gcc_no_link=no], [gcc_no_link=yes]) | ||||||
| if test x$gcc_no_link = xyes; then | if test x$gcc_no_link = xyes; then | ||||||
| @@ -35,7 +35,7 @@ if test x$gcc_no_link = xyes; then | |||||||
|   cross_compiling=yes |   cross_compiling=yes | ||||||
|   EXEEXT= |   EXEEXT= | ||||||
| else | else | ||||||
|   m4_defn([_AC_COMPILER_EXEEXT])dnl |   ]m4_defn([_AC_COMPILER_EXEEXT])dnl | ||||||
| fi | fi | ||||||
| ) | ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -12,6 +12,16 @@ dnl | |||||||
| dnl The _GCC_AUTOCONF_VERSION_TEST ensures that exactly the desired | dnl The _GCC_AUTOCONF_VERSION_TEST ensures that exactly the desired | ||||||
| dnl Autoconf version is used.  It should be kept for consistency. | dnl Autoconf version is used.  It should be kept for consistency. | ||||||
|  |  | ||||||
|  | dnl Provide m4_copy_force and m4_rename_force for old Autoconf versions. | ||||||
|  |  | ||||||
|  | m4_ifndef([m4_copy_force], | ||||||
|  | [m4_define([m4_copy_force], | ||||||
|  | [m4_ifdef([$2], [m4_undefine([$2])])m4_copy($@)])]) | ||||||
|  |  | ||||||
|  | m4_ifndef([m4_rename_force], | ||||||
|  | [m4_define([m4_rename_force], | ||||||
|  | [m4_ifdef([$2], [m4_undefine([$2])])m4_rename($@)])]) | ||||||
|  |  | ||||||
| dnl m4_PACKAGE_VERSION is an undocumented Autoconf macro. | dnl m4_PACKAGE_VERSION is an undocumented Autoconf macro. | ||||||
| dnl We use it because this fix is intended for 2.59 only. | dnl We use it because this fix is intended for 2.59 only. | ||||||
| dnl A feature test for the broken AC_CONFIG_SUBDIRS instead | dnl A feature test for the broken AC_CONFIG_SUBDIRS instead | ||||||
| @@ -25,7 +35,7 @@ ifdef([m4_PACKAGE_VERSION], | |||||||
| [dnl AC_DEFUN a commonly used macro so this file is picked up. | [dnl AC_DEFUN a commonly used macro so this file is picked up. | ||||||
| m4_copy([AC_PREREQ], [_AC_PREREQ]) | m4_copy([AC_PREREQ], [_AC_PREREQ]) | ||||||
| AC_DEFUN([AC_PREREQ], [frob]) | AC_DEFUN([AC_PREREQ], [frob]) | ||||||
| m4_copy([_AC_PREREQ], [AC_PREREQ]) | m4_copy_force([_AC_PREREQ], [AC_PREREQ]) | ||||||
|  |  | ||||||
|  |  | ||||||
| dnl Ensure exactly this Autoconf version is used | dnl Ensure exactly this Autoconf version is used | ||||||
|   | |||||||
| @@ -11,8 +11,8 @@ AC_DEFUN([GCC_CHECK_TLS], [ | |||||||
|       chktls_save_LDFLAGS="$LDFLAGS" |       chktls_save_LDFLAGS="$LDFLAGS" | ||||||
|       LDFLAGS="-static $LDFLAGS" |       LDFLAGS="-static $LDFLAGS" | ||||||
|       AC_LINK_IFELSE([int main() { return 0; }], |       AC_LINK_IFELSE([int main() { return 0; }], | ||||||
| 	AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], | 	[AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], | ||||||
| 		      [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[]), | 		       [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[])], | ||||||
| 	[gcc_cv_have_tls=yes]) | 	[gcc_cv_have_tls=yes]) | ||||||
|       LDFLAGS="$chktls_save_LDFLAGS" |       LDFLAGS="$chktls_save_LDFLAGS" | ||||||
|       if test $gcc_cv_have_tls = yes; then |       if test $gcc_cv_have_tls = yes; then | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user