From 93b19fb8df271b1577a80c3bb48dd86c79661929 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 18 Dec 2012 12:00:51 +0100 Subject: [PATCH] added debug output for configure --- Makefile.in | 2 +- aclocal.m4 | 6 +++--- config/compile | 7 ++++++- config/config.guess | 4 ++-- config/config.sub | 17 ++++++++++------- config/depcomp | 11 +++++++++-- configure | 16 +++++++++++++--- configure.ac | 7 +++++++ 8 files changed, 51 insertions(+), 19 deletions(-) diff --git a/Makefile.in b/Makefile.in index aa8c834c72..cf4fb51d80 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/aclocal.m4 b/aclocal.m4 index b3c0903096..c907580106 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.12.4 -*- Autoconf -*- +# generated automatically by aclocal 1.12.5 -*- Autoconf -*- # Copyright (C) 1996-2012 Free Software Foundation, Inc. @@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.4], [], +m4_if([$1], [1.12.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.4])dnl +[AM_AUTOMAKE_VERSION([1.12.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/config/compile b/config/compile index 7b4a9a7e1e..718dc6d0bf 100755 --- a/config/compile +++ b/config/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC # Copyright (C) 1999-2012 Free Software Foundation, Inc. # Written by Tom Tromey . @@ -112,6 +112,11 @@ func_cl_dashl () lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff --git a/config/config.guess b/config/config.guess index 137bedf2e2..872b96a161 100755 --- a/config/config.guess +++ b/config/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-08-14' +timestamp='2012-09-25' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -306,7 +306,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) diff --git a/config/config.sub b/config/config.sub index bdda9e4a32..89b1286300 100755 --- a/config/config.sub +++ b/config/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-08-18' +timestamp='2012-10-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -156,7 +156,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,8 +259,10 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -273,7 +275,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -389,7 +391,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -788,7 +791,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; mingw64) diff --git a/config/depcomp b/config/depcomp index 0544c68351..e1f51f482a 100755 --- a/config/depcomp +++ b/config/depcomp @@ -74,6 +74,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -108,7 +111,7 @@ if test "$depmode" = msvc7msys; then fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. gccflag=-qmakedep=gcc,-MF depmode=gcc fi @@ -142,13 +145,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then diff --git a/configure b/configure index 83fa5c66ee..0879a45f2d 100755 --- a/configure +++ b/configure @@ -2458,6 +2458,18 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +CURRENT_DIR=`pwd` +{ $as_echo "$as_me:${as_lineno-$LINENO}: configure started in '$CURRENT_DIR" >&5 +$as_echo "$as_me: configure started in '$CURRENT_DIR" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: with CPPFLAGS='$CPPFLAGS'" >&5 +$as_echo "$as_me: with CPPFLAGS='$CPPFLAGS'" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: with CFLAGS='$CFLAGS'" >&5 +$as_echo "$as_me: with CFLAGS='$CFLAGS'" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: with CXXFLAGS='$CXXFLAGS'" >&5 +$as_echo "$as_me: with CXXFLAGS='$CXXFLAGS'" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: with LDFLAGS='$LDFLAGS'" >&5 +$as_echo "$as_me: with LDFLAGS='$LDFLAGS'" >&6;} + # Check whether --enable-all-in-one-libev was given. @@ -5277,8 +5289,6 @@ $as_echo "no" >&6; } fi -LDFLAGS=-g - # Check whether --enable-error-on-warning was given. if test "${enable_error_on_warning+set}" = set; then : enableval=$enable_error_on_warning; tr_WERROR="${enableval:-yes}" @@ -5553,7 +5563,7 @@ fi if test "x$tr_STATIC_PROGRAMS" = xyes; then - LDFLAGS="-static" + LDFLAGS="$LDFLAGS -static" fi diff --git a/configure.ac b/configure.ac index d33dc120f4..e65c7941b0 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,13 @@ dnl ---------------------------------------------------------------------------- AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) +CURRENT_DIR=`pwd` +AC_MSG_NOTICE([configure started in '$CURRENT_DIR]) +AC_MSG_NOTICE([with CPPFLAGS='$CPPFLAGS']) +AC_MSG_NOTICE([with CFLAGS='$CFLAGS']) +AC_MSG_NOTICE([with CXXFLAGS='$CXXFLAGS']) +AC_MSG_NOTICE([with LDFLAGS='$LDFLAGS']) + dnl ============================================================================ dnl --SECTION-- 3RD-PARTY LIBRARIES dnl ============================================================================