diff options
Diffstat (limited to 'gnattools')
| -rw-r--r-- | gnattools/ChangeLog | 7 | ||||
| -rw-r--r-- | gnattools/Makefile.in | 3 | ||||
| -rwxr-xr-x | gnattools/configure | 131 | ||||
| -rw-r--r-- | gnattools/configure.ac | 4 |
4 files changed, 33 insertions, 112 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index 99cb698341e..88e77602232 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,3 +1,10 @@ +2008-06-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * configure.ac: move sinclude of acx.m4 before AC_INIT, + also sinclude override.m4. + * Makefile.in ($(srcdir)/configure): Update dependencies. + * configure: Regenerate. + 2008-06-07 Joseph Myers <joseph@codesourcery.com> * configure.ac (xscale*-wrs-vx*, xscale*-wrs-coff): Remove. diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index 46da2df8ba7..efc5f7575f0 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -314,7 +314,8 @@ Makefile: $(srcdir)/Makefile.in config.status config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac +$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac \ + $(srcdir)/../config/acx.m4 $(srcdir)/../config/override.m4 cd $(srcdir) && autoconf # Don't export variables to the environment, in order to not confuse diff --git a/gnattools/configure b/gnattools/configure index 31a2ff5031b..28de7b5a08d 100755 --- a/gnattools/configure +++ b/gnattools/configure @@ -274,6 +274,7 @@ PACKAGE_BUGREPORT= ac_unique_file="Makefile.in" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S x_ada_cflags default_gnattools_target TOOLS_TARGET_PAIRS EXTRA_GNATTOOLS LIBOBJS LTLIBOBJS' ac_subst_files='' +ac_pwd=`pwd` # Initialize some variables set by options. ac_init_help= @@ -1173,13 +1174,22 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: + else + { echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +echo "$as_me: former value: \`$ac_old_val'" >&2;} + { echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -1196,6 +1206,8 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then + { echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +echo "$as_me: error: in \`$ac_pwd':" >&2;} { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 @@ -1231,6 +1243,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + # Command-line options. # Very limited version of AC_MAINTAINER_MODE. # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. @@ -1438,110 +1453,6 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- -# Autoconf M4 include file defining utility macros for complex Canadian -# cross builds. - - - - - - - - - -#### -# _NCN_TOOL_PREFIXES: Some stuff that oughtta be done in AC_CANONICAL_SYSTEM -# or AC_INIT. -# These demand that AC_CANONICAL_SYSTEM be called beforehand. - -#### -# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path]) -# Like plain AC_CHECK_TOOLS, but require prefix if build!=host. - - -#### -# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path]) -# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target. - - - -# Backported from Autoconf 2.5x; can go away when and if -# we switch. Put the OS path separator in $PATH_SEPARATOR. - - - - -# ACX_HAVE_GCC_FOR_TARGET -# Check if the variable GCC_FOR_TARGET really points to a GCC binary. - - -# ACX_CHECK_INSTALLED_TARGET_TOOL(VAR, PROG) -# Searching for installed target binutils. We need to take extra care, -# else we may find the wrong assembler, linker, etc., and lose. -# -# First try --with-build-time-tools, if specified. -# -# For build != host, we ask the installed GCC for the name of the tool it -# uses, and accept it if it is an absolute path. This is because the -# only good choice for a compiler is the same GCC version that is being -# installed (or we couldn't make target libraries), and we assume that -# on the host system we'll have not only the same GCC version, but also -# the same binutils version. -# -# For build == host, search the same directories that the installed -# compiler will search. We used to do this for the assembler, linker, -# and nm only; for simplicity of configuration, however, we extend this -# criterion to tools (such as ar and ranlib) that are never invoked by -# the compiler, to avoid mismatches. -# -# Also note we have to check MD_EXEC_PREFIX before checking the user's path -# if build == target. This makes the most sense only when bootstrapping, -# but we also do so when build != host. In this case, we hope that the -# build and host systems will have similar contents of MD_EXEC_PREFIX. -# -# If we do not find a suitable binary, then try the user's path. - - -### -# AC_PROG_CPP_WERROR -# Used for autoconf 2.5x to force AC_PREPROC_IFELSE to reject code which -# triggers warnings from the preprocessor. Will be in autoconf 2.58. -# For now, using this also overrides header checks to use only the -# preprocessor (matches 2.13 behavior; matching 2.58's behavior is a -# bit harder from here). -# Eventually autoconf will default to checking headers with the compiler -# instead, and we'll have to do this differently. - -# AC_PROG_CPP_WERROR - -# Test for GNAT. -# We require the gnatbind program, and a compiler driver that -# understands Ada. We use the user's CC setting, already found, -# and possibly add $1 to the command-line parameters. -# -# Sets the shell variable have_gnat to yes or no as appropriate, and -# substitutes GNATBIND and GNATMAKE. - - - - - - - - - - - - - - - - - - - - - case ${build_alias} in "") build_noncanonical=${build} ;; *) build_noncanonical=${build_alias} ;; diff --git a/gnattools/configure.ac b/gnattools/configure.ac index a9eeaa4ec05..7ad6df08cdc 100644 --- a/gnattools/configure.ac +++ b/gnattools/configure.ac @@ -15,6 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +sinclude(../config/acx.m4) +sinclude(../config/override.m4) + AC_INIT AC_PREREQ([2.59]) @@ -43,7 +46,6 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET -sinclude(../config/acx.m4) ACX_NONCANONICAL_TARGET # Need to pass this down for now :-P |