diff -ruNp libtool-2.2/ChangeLog libtool-2.2.2/ChangeLog --- libtool-2.2/ChangeLog 2008-03-01 19:05:01.000000000 -0500 +++ libtool-2.2.2/ChangeLog 2008-04-01 19:32:01.000000000 -0400 @@ -1,5 +1,214 @@ +2008-04-01 Gary V. Vaughan + + GNU Libtool 2.2.2 was released. + + * configure.ac, libltdl/configure.ac (AC_INIT): Bump version + number to 2.2.2. + * libltdl/Makefile.in (LTDL_VERSION_INFO): C:R+1:A because the + interfaces are unchanged, even though we improved the code some + more. + * NEWS: Updated. + + * libltdl/m4/libtool.m4, libltdl/m4/ltdl.m4, + libltdl/m4/ltoptions.m4: Bump serial numbers to account for + changes since 2.2 release. + +2008-03-27 Peter O'Gorman + + * libltdl/m4/libtool.m4 [_LT_REQUIRED_DARWIN_CHECKS]: Fix the + test for -single_module and log it to config.log. + Reported by Torok Edwin and Nigel Home. + +2008-03-24 Ralf Wildenhues + + Document that disable-static plus -all-static is not portable. + * doc/libtool.texi (Link mode): -all-static does not go well + with disable-static on most systems. + * tests/static.at (static linking flags for programs) [!aix]: + With --disable-static but nonempty link_static_flag, skip the + m-all-static link. Do not skip it on AIX, as there the + enable_static is self-inflicted, and thus expected to work. + * THANKS: Update. + Report by Nix. + +2008-03-17 Ralf Wildenhues + + * libltdl/m4/libtool.m4 (_LT_CHECK_BUILDDIR): No need to escape + backticks in argument to AC_MSG_WARN or AC_MSG_ERROR. + * libltdl/m4/ltdl.m4 (_LTDL_INSTALLABLE, LTDL_INIT): Likewise. + +2008-03-16 Ralf Wildenhues + + * libltdl/config/ltmain.m4sh (NLS nuisances): Fix quoting of + localization variables for shell-active characters. + * tests/localization.at (localized compiler messages): Extend + test. + * THANKS: Update. + Report by Mike Frysinger. + +2008-03-15 Ralf Wildenhues + + * tests/defs.m4sh (func_get_config): Build egrep regex to speed + up extracting several variables at once. Use it to extract all + default variables at once. Also extract build_alias and + host_alias from the libtool script. + (func_configure_nofail): Use build_alias and host_alias for + --build and --host, respectively. Pass each if nonempty. + * tests/testsuite.at: Pass --build if build_alias is nonemtpy. + * tests/quote.test: Extract ECHO and wl at once. + + * libltdl/m4/ltoptions.m4 (AC_LIBTOOL_WIN32_DLL): Require + AC_CANONICAL_HOST. + * THANKS: Update. + Report by Jakub Bogusz. + +2008-03-14 Ralf Wildenhues + + * NEWS: Update. + +2008-03-12 Charles Wilson + + * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src) [file + scope]: additional #includes and #defines to support... + (func_emit_cwrapperexe_src) [main]: ensure stdout is set to + binary mode for cygwin|mingw builds. Ensure temporary script + file is written in binary mode for cygwin|mingw builds. + (func_mode_link) [cygwin|mingw]: cross-build support - only + use cwrapper to generate shell wrapper if building native; + otherwise use func_emit_wrapper() + +2008-03-12 Henning Nielsen Lund + + * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) + (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS) [amigaos]: Port to + AmigaOS4 shared libraries on powerpc. + * libltdl/m4/ltdl.m4 (LT_SYS_DLOPEN_DEPLIBS) [amigaos]: + Likewise. + * THANKS, NEWS: Update. + +2008-03-09 Bruno Haible + and Ralf Wildenhues + + Fix compiler output to be in the user locale. + * libltdl/config/general.m4sh (func_show_eval_locale): New + function, for running commands in the user locale. + * libltdl/config/ltmain.m4sh (func_mode_compile): Use it for + compiling. + * tests/localization.at (localized compiler messages): New test. + * Makefile.am: Adjust. + Report by Bruno Haible. + +2008-03-08 Ralf Wildenhues + + Fix several test failures on Cygwin and MinGW. + * tests/nonrecursive.at: Use -no-undefined for foo.la. + * tests/recursive.at: Likewise. + * tests/subproject.at: Likewise. + * tests/lt_dladvise.at: For systems where undefined symbols are + not allowed, to not try to load the module libdepend. + [ mingw ]: Add to list of such systems. + * tests/testsuite.at (_LT_AT_TRANSLATE_TEXT_OUTPUT): New macro, + to translate line ending of expout and experr files suitable for + host executables. + (LT_AT_CHECK, LT_AT_NOINST_EXEC_CHECK): Use it. + Report by Bob Friesenhahn. + + Fix installcheck dependencies, fix for --program-transform-name. + * Makefile.am (installcheck-local): Depend upon tests/atconfig + and $(srcdir)/$(TESTSUITE). + * tests/testsuite.at (_LIBTOOLIZE_TRANSFORM): New macro. + (LT_AT_CHECK_LIBTOOLIZE): Use it to transform expout and experr + files suitably. + * HACKING: Update. + + Drop usage of obsolete macros AC_EXEEXT and AC_OBJEXT. + * libltdl/m4/libtool.m4 (_LT_ENABLE_LOCK, _LT_COMPILER_OPTION) + (_LT_COMPILER_C_O, LT_PATH_NM, _LT_CMD_GLOBAL_SYMBOLS, _LT_SETUP): + Drop usage of obsolete AC_OBJEXT and AC_EXEEXT. + * tests/am-subdir.at (C++ subdir-objects): Likewise. + +2008-03-07 Peter O'Gorman + + * tests/convenience.at (Java convenience archives): Skip test if + gcj cannot compile a working executable from .java files. + Report by Nelson H. F. Beebe. + + * libltdl/m4/libtool.m4 (_LT_LANG_GCJ_CONFIG): Need to set LD. + Reported by Nelson H. F. Beebe. + +2008-03-06 Peter O'Gorman + + * libltdl/m4/libtool.m4 (_LT_PROG_FC): Undo commit - bad idea. + + * libltdl/m4/libtool.m4 (_LT_PROG_FC): Report FC=no if the FC + compiler is not a GNU compiler and the CXX compiler is a GNU + compiler. + Reported by Nelson H. F. Beebe. + +2008-03-06 Gary V. Vaughan + + * Makefile.maint (TSDEPS_DIST): Removed. No longer used. + (TSDEPS): libtool.m4 has long since moved to libltdl. + (cvs-dist): Don't put the suffix dot in twice. + +2008-03-06 Ralf Wildenhues + + * tests/convenience.at (Java convenience archives): Skip test if + gcj cannot compile a .java file. + Report by Nelson H. F. Beebe. + +2008-03-05 Ralf Wildenhues + + * libltdl/config/ltmain.m4sh (func_lalib_unsafe_p): redirect + and restore from stdin, not stdout. + * tests/execute-mode.at (execute mode): Adjust test to catch + this. + Report by Roberto Bagnara. + +2008-03-04 Ralf Wildenhues + + Fix libltdl to not skip dlopen on systems with several loaders, + such as HP-UX, Cygwin. + * libltdl/slist.c (slist_concat): When appending to the tail + of a list, do not drop items off the beginning of the list. + * NEWS: Update. + + * libltdl/config/ltmain.m4sh (func_mode_execute): Replace only + arguments we have identified as shell or C wrappers. + (func_emit_wrapper): Output error message on stderr. + * tests/execute-mode.at: New file, with --mode=execute tests. + * Makefile.am: Adjust. + * NEWS: Update. + Fixes 2.2 regression. Report by Roberto Bagnara. + + * libltdl/m4/libtool.m4 (_LT_CONFIG): Drop misleading `GNU' + prefix before the host package name in the "Generated by" line + for the libtool script. + * THANKS: Update. + Reports by Peter Rosin and Roberto Bagnara. + + * doc/libtool.texi (Module loaders for libltdl): Fix typo. + + * libltdl/loaders/dld_link.c (vl_exit): New function, zero out ... + (vtable): ... this new file static variable split out from ... + (get_vtable): ... here. Initialize vtable, register vl_exit as + dlloader_exit function. + * libltdl/loaders/dlopen.c: Likewise. + * libltdl/loaders/dyld.c: Likewise. + * libltdl/loaders/load_add_on.c: Likewise. + * libltdl/loaders/loadlibrary.c: Likewise. + * libltdl/loaders/shl_load.c: Likewise. + * libltdl/loaders/preopen.c: Likewise; vl_exit existed here + already. + * tests/lt_dlexit.at (lt_dlexit unloading libs): Update test. + * NEWS: Update. + Report by Andreas Schwab. + 2008-03-01 Gary V. Vaughan + * configure.ac, libltdl/configure.ac (AC_INIT): Bump version + number to 2.3a. + GNU Libtool 2.2 was released. * configure.ac, libltdl/configure.ac (AC_INIT): Bump version @@ -492,6 +701,6 @@ Continued in ChangeLog.2007 - $Revision: 1.2599 $ $Date: 2008/03/02 00:05:01 $ + $Revision: 1.2627 $ $Date: 2008/04/01 23:32:01 $ vim:tw=72 diff -ruNp libtool-2.2/INSTALL libtool-2.2.2/INSTALL --- libtool-2.2/INSTALL 2008-03-01 12:50:59.000000000 -0500 +++ libtool-2.2.2/INSTALL 2008-04-01 20:18:45.000000000 -0400 @@ -2,7 +2,7 @@ Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. +2006, 2007 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. diff -ruNp libtool-2.2/Makefile.am libtool-2.2.2/Makefile.am --- libtool-2.2/Makefile.am 2008-01-31 11:11:02.000000000 -0500 +++ libtool-2.2.2/Makefile.am 2008-04-01 14:06:08.000000000 -0400 @@ -447,6 +447,8 @@ TESTSUITE_AT = tests/testsuite.at \ tests/search-path.at \ tests/indirect_deps.at \ tests/archive-in-archive.at \ + tests/execute-mode.at \ + tests/localization.at \ tests/destdir.at \ tests/old-m4-iface.at \ tests/am-subdir.at \ @@ -522,7 +524,7 @@ check-local: tests/atconfig $(srcdir)/$( $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) # Run the test suite on the *installed* tree. -installcheck-local: +installcheck-local: tests/atconfig $(srcdir)/$(TESTSUITE) $(CD_TESTDIR); \ CONFIG_SHELL="$(SHELL)" $(SHELL) $$abs_srcdir/$(TESTSUITE) \ $(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) \ diff -ruNp libtool-2.2/Makefile.in libtool-2.2.2/Makefile.in --- libtool-2.2/Makefile.in 2008-03-01 19:11:27.000000000 -0500 +++ libtool-2.2.2/Makefile.in 2008-04-01 20:18:45.000000000 -0400 @@ -454,7 +454,7 @@ sub_aclocal_m4_deps = \ $(m4dir)/lt~obsolete.m4 sub_configure_deps = $(sub_aclocal_m4_deps) $(srcdir)/libltdl/aclocal.m4 -LTDL_VERSION_INFO = -version-info 8:0:1 +LTDL_VERSION_INFO = -version-info 8:1:1 @INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl @INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = libltdl/libltdl/lt_system.h \ @INSTALL_LTDL_TRUE@ libltdl/libltdl/lt_error.h \ @@ -558,6 +558,8 @@ TESTSUITE_AT = tests/testsuite.at \ tests/search-path.at \ tests/indirect_deps.at \ tests/archive-in-archive.at \ + tests/execute-mode.at \ + tests/localization.at \ tests/destdir.at \ tests/old-m4-iface.at \ tests/am-subdir.at \ @@ -2052,7 +2054,7 @@ check-local: tests/atconfig $(srcdir)/$( $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) # Run the test suite on the *installed* tree. -installcheck-local: +installcheck-local: tests/atconfig $(srcdir)/$(TESTSUITE) $(CD_TESTDIR); \ CONFIG_SHELL="$(SHELL)" $(SHELL) $$abs_srcdir/$(TESTSUITE) \ $(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) \ diff -ruNp libtool-2.2/NEWS libtool-2.2.2/NEWS --- libtool-2.2/NEWS 2008-03-01 19:00:47.000000000 -0500 +++ libtool-2.2.2/NEWS 2008-04-01 14:23:49.000000000 -0400 @@ -1,5 +1,28 @@ NEWS - list of user-visible changes between releases of GNU Libtool +New in 2.2.2: 2008-04-01: CVS version 2.2.1a, Libtool team: + +* New features: + + - In compile mode, compiler output occurs in the user locale. This + feature has been present in 1.5.26 but not in 2.2. + +* Changes in supported systems or compilers: + + - Initial shared library support for AmigaOS4 on powerpc. + +* Bug fixes: + + - Fix 2.2 regression in libltdl that causes memory corruption upon + repeated `lt_dlinit(); lt_dlexit()'. + - Fix 2.2 regression in libltdl that skipped the dlopen loader if + the system also supports other loaders (e.g., Cygwin, HP-UX). + - Fix 2.2 regression in that `libtool --mode=execute CMD ARGS' does not + transform ARGS that do not look like shell or C wrappers of libtool + programs. + - Fix 2.2 regression that kept cross-compiling to w32 from working. + - Several testsuite issues have been fixed, thanks to user feedback. + New in 2.2: 2008-03-01; CVS version 2.1c, Libtool team: * Bug fixes: diff -ruNp libtool-2.2/THANKS libtool-2.2.2/THANKS --- libtool-2.2/THANKS 2008-01-07 23:27:25.000000000 -0500 +++ libtool-2.2.2/THANKS 2008-04-01 14:06:08.000000000 -0400 @@ -87,8 +87,10 @@ Frank Ch. Eigler fche@cygnus.com Fred Cox sailorfred@yahoo.com H.J. Lu hjl@gnu.org + Henning Nielsen Lund hnl_dk@amigaos.dk Howard Chu hyc@highlandsun.com Ian Lance Taylor ian@cygnus.com + Jakub Bogusz qboosh@pld-linux.org Jacob Meuser jakemsr@jakemsr.com James Su james.su@gmail.com Jeff Squyres jsquyres@lam-mpi.org @@ -106,6 +108,8 @@ Marc Espie espie@nerim.net Marc J. Fraioli fraioli@dg-rtp.dg.com Mark Kettenis kettenis@phys.uva.nl + Mike Frysinger vapier@gentoo.org + Nix nix@esperi.org.uk Olly Betts olly@muscat.co.uk Patrick Welche prlw1@newn.cam.ac.uk Paul Eggert eggert@twinsun.com @@ -115,6 +119,7 @@ Rainer Tammer tammer@tammer.net Ralf Menzel menzel@ls6.cs.uni-dortmund.de Robert Ögren lists@roboros.com + Roberto Bagnara bagnara@cs.unipr.it Sebastian Wilhelmi wilhelmi@ira.uka.de Simon Josefsson jas@extundo.com Stephan Kulow coolo@kde.org diff -ruNp libtool-2.2/configure libtool-2.2.2/configure --- libtool-2.2/configure 2008-03-01 19:11:29.000000000 -0500 +++ libtool-2.2.2/configure 2008-04-01 20:18:40.000000000 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for libtool 2.2. +# Generated by GNU Autoconf 2.61 for libtool 2.2.2. # # Report bugs to . # @@ -727,8 +727,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libtool' PACKAGE_TARNAME='libtool' -PACKAGE_VERSION='2.2' -PACKAGE_STRING='libtool 2.2' +PACKAGE_VERSION='2.2.2' +PACKAGE_STRING='libtool 2.2.2' PACKAGE_BUGREPORT='bug-libtool@gnu.org' ac_unique_file="libtoolize.in" @@ -1448,7 +1448,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libtool 2.2 to adapt to many kinds of systems. +\`configure' configures libtool 2.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1518,7 +1518,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libtool 2.2:";; + short | recursive ) echo "Configuration of libtool 2.2.2:";; esac cat <<\_ACEOF @@ -1623,7 +1623,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libtool configure 2.2 +libtool configure 2.2.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1637,7 +1637,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libtool $as_me 2.2, which was +It was created by libtool $as_me 2.2.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2059,13 +2059,13 @@ AUTOTEST='$(AUTOM4TE) --language=autotes # http://www.gnu.org/software/libtool/contribute.html # First we break the version number up into its constituent parts. -lt_major=`echo "2.2" | sed 's,\..*$,,g'` -lt_minor=`echo "2.2" | sed 's,^[0-9]*\.\([0-9]*\).*$,\1,'` -lt_micro=`echo "2.2" | sed 's,^[0-9]*\.[0-9]*\(\.[0-9]*\).*$,\1,'` -lt_alpha=`echo "2.2" | sed 's,^[0-9.]*,,'` +lt_major=`echo "2.2.2" | sed 's,\..*$,,g'` +lt_minor=`echo "2.2.2" | sed 's,^[0-9]*\.\([0-9]*\).*$,\1,'` +lt_micro=`echo "2.2.2" | sed 's,^[0-9]*\.[0-9]*\(\.[0-9]*\).*$,\1,'` +lt_alpha=`echo "2.2.2" | sed 's,^[0-9.]*,,'` -test "$lt_minor" = "2.2" && lt_minor=0 -test "$lt_micro" = "2.2" && lt_micro="" +test "$lt_minor" = "2.2.2" && lt_minor=0 +test "$lt_micro" = "2.2.2" && lt_micro="" # Then we try to work out what the release before this one would have been # numbered. The only time we come unstuck is when this is the first release @@ -2082,9 +2082,9 @@ case $lt_alpha in esac ;; [cegikmoqsuwy]) - LASTRELEASE=`echo "2.2" | tr 'c-y' 'b-w'` ;; + LASTRELEASE=`echo "2.2.2" | tr 'c-y' 'b-w'` ;; [dfhjlnprtvxz]) - LASTRELEASE=`echo "2.2" | tr 'd-z' 'b-x'` ;; + LASTRELEASE=`echo "2.2.2" | tr 'd-z' 'b-x'` ;; *) # No lt_alpha component case $lt_micro in .0) @@ -2112,7 +2112,7 @@ case $lt_alpha in ;; esac sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Configuring libtool${TIMESTAMP:+" (Build:$TIMESTAMP)"} 2.2 ## +## Configuring libtool${TIMESTAMP:+" (Build:$TIMESTAMP)"} 2.2.2 ## _ASBOX echo @@ -2429,7 +2429,7 @@ fi # Define the identity of the package. PACKAGE='libtool' - VERSION='2.2' + VERSION='2.2.2' cat >>confdefs.h <<_ACEOF @@ -4094,8 +4094,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -4669,7 +4669,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -4848,13 +4847,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4851: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4850: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4854: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4853: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4857: output\"" >&5) + (eval echo "\"\$as_me:4856: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5009,7 +5008,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5964,7 +5962,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5967 "configure"' > conftest.$ac_ext + echo '#line 5965 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6368,14 +6366,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -7585,11 +7589,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7588: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7592: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7592: \$? = $ac_status" >&5 + echo "$as_me:7596: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7639,12 +7643,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -7903,11 +7913,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7906: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7916: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7910: \$? = $ac_status" >&5 + echo "$as_me:7920: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8008,11 +8018,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8011: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8021: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8015: \$? = $ac_status" >&5 + echo "$as_me:8025: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8063,11 +8073,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8066: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8076: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8070: \$? = $ac_status" >&5 + echo "$as_me:8080: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8229,19 +8239,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -8700,13 +8709,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -9540,13 +9554,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -10802,7 +10821,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10805 "configure" +#line 10824 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10902,7 +10921,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10905 "configure" +#line 10924 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11953,7 +11972,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11956 "configure" +#line 11975 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12070,6 +12089,13 @@ else aix[4-9]*) lt_cv_sys_dlopen_deplibs=yes ;; + amigaos*) + case $host_cpu in + powerpc) + lt_cv_sys_dlopen_deplibs=no + ;; + esac + ;; darwin*) # Assuming the user has installed a libdl from somewhere, this is true # If you are looking for one http://www.opendarwin.org/projects/dlcompat @@ -14978,14 +15004,22 @@ echo $ECHO_N "checking for $compiler opt lt_prog_compiler_static_CXX='-Bstatic' fi ;; + amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_CXX='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -15290,11 +15324,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15293: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15327: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15297: \$? = $ac_status" >&5 + echo "$as_me:15331: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15389,11 +15423,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15392: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15426: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15396: \$? = $ac_status" >&5 + echo "$as_me:15430: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15441,11 +15475,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15444: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15478: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15448: \$? = $ac_status" >&5 + echo "$as_me:15482: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15738,13 +15772,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -16829,12 +16868,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_F77='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -17090,11 +17135,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17093: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17138: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17097: \$? = $ac_status" >&5 + echo "$as_me:17142: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17189,11 +17234,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17192: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17237: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17196: \$? = $ac_status" >&5 + echo "$as_me:17241: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17241,11 +17286,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17244: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17289: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17248: \$? = $ac_status" >&5 + echo "$as_me:17293: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17404,19 +17449,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_F77=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='' + ;; + m68k) + archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + ;; + esac ;; beos*) @@ -17855,13 +17899,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs_F77=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='' + ;; + m68k) + archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + ;; + esac ;; bsdi[45]*) @@ -18542,13 +18591,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -19742,12 +19796,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_FC='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -20003,11 +20063,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20006: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20066: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20010: \$? = $ac_status" >&5 + echo "$as_me:20070: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -20102,11 +20162,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20105: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20165: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20109: \$? = $ac_status" >&5 + echo "$as_me:20169: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20154,11 +20214,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20157: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20217: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20161: \$? = $ac_status" >&5 + echo "$as_me:20221: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20317,19 +20377,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_FC='-L$libdir' - hardcode_minus_L_FC=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_FC=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_FC='' + ;; + m68k) + archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_FC='-L$libdir' + hardcode_minus_L_FC=yes + ;; + esac ;; beos*) @@ -20768,13 +20827,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_FC='-L$libdir' - hardcode_minus_L_FC=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs_FC=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_FC='' + ;; + m68k) + archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_FC='-L$libdir' + hardcode_minus_L_FC=yes + ;; + esac ;; bsdi[45]*) @@ -21455,13 +21519,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -22248,6 +22317,7 @@ GCC=yes CC=${GCJ-"gcj"} compiler=$CC compiler_GCJ=$CC +LD_GCJ="$LD" for cc_temp in $compiler""; do case $cc_temp in compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; @@ -22293,11 +22363,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:22296: $lt_compile\"" >&5) + (eval echo "\"\$as_me:22366: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:22300: \$? = $ac_status" >&5 + echo "$as_me:22370: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -22344,12 +22414,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_GCJ='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -22605,11 +22681,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:22608: $lt_compile\"" >&5) + (eval echo "\"\$as_me:22684: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:22612: \$? = $ac_status" >&5 + echo "$as_me:22688: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -22704,11 +22780,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:22707: $lt_compile\"" >&5) + (eval echo "\"\$as_me:22783: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:22711: \$? = $ac_status" >&5 + echo "$as_me:22787: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22756,11 +22832,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:22759: $lt_compile\"" >&5) + (eval echo "\"\$as_me:22835: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:22763: \$? = $ac_status" >&5 + echo "$as_me:22839: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22919,19 +22995,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_GCJ='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_GCJ=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='' + ;; + m68k) + archive_cmds_GCJ='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes + ;; + esac ;; beos*) @@ -23390,13 +23465,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_GCJ='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs_GCJ=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='' + ;; + m68k) + archive_cmds_GCJ='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes + ;; + esac ;; bsdi[45]*) @@ -24759,7 +24839,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libtool $as_me 2.2, which was +This file was extended by libtool $as_me 2.2.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24812,7 +24892,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libtool config.status 2.2 +libtool config.status 2.2.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -26483,7 +26563,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/configure.ac libtool-2.2.2/configure.ac --- libtool-2.2/configure.ac 2008-03-01 17:54:27.000000000 -0500 +++ libtool-2.2.2/configure.ac 2008-04-01 14:23:49.000000000 -0400 @@ -30,7 +30,7 @@ dnl Oldest automake required for bootstr ## ------------------------ ## ## Autoconf initialisation. ## ## ------------------------ ## -AC_INIT([libtool], [2.2], [bug-libtool@gnu.org]) +AC_INIT([libtool], [2.2.2], [bug-libtool@gnu.org]) AC_CONFIG_HEADERS([config.h:config-h.in]) AC_CONFIG_SRCDIR([libtoolize.in]) LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive]) diff -ruNp libtool-2.2/doc/libtool.info libtool-2.2.2/doc/libtool.info --- libtool-2.2/doc/libtool.info 2008-03-01 18:05:04.000000000 -0500 +++ libtool-2.2.2/doc/libtool.info 2008-04-01 15:02:59.000000000 -0400 @@ -10,7 +10,7 @@ START-INFO-DIR-ENTRY * libtoolize: (libtool)Invoking libtoolize. Adding libtool support. END-INFO-DIR-ENTRY - This file documents GNU Libtool 2.2 + This file documents GNU Libtool 2.2.2 Copyright (C) 1996-2008 Free Software Foundation, Inc. @@ -23,102 +23,102 @@ Free Documentation License".  Indirect: -libtool.info-1: 874 +libtool.info-1: 876  Tag Table: (Indirect) -Node: Top874 -Node: Introduction7111 -Node: Motivation8933 -Node: Issues10253 -Node: Other implementations11731 -Node: Postmortem12274 -Node: Libtool paradigm13894 -Node: Using libtool14839 -Node: Creating object files16942 -Node: Linking libraries20675 -Ref: Linking libraries-Footnote-124503 -Node: Linking executables24644 -Ref: Linking executables-Footnote-129722 -Ref: Linking executables-Footnote-230015 -Node: Debugging executables30095 -Node: Installing libraries32918 -Ref: Installing libraries-Footnote-136080 -Node: Installing executables36151 -Node: Static libraries36987 -Node: Invoking libtool40250 -Node: Compile mode43631 -Node: Link mode46670 -Node: Execute mode54503 -Node: Install mode55283 -Node: Finish mode57636 -Node: Uninstall mode58071 -Node: Clean mode58512 -Node: Integrating libtool58971 -Node: Autoconf macros59728 -Node: Makefile rules63575 -Node: Using Automake64678 -Ref: Using Automake-Footnote-166259 -Node: Configuring66655 -Node: LT_INIT67907 -Ref: LT_INIT-Footnote-182005 -Node: Configure notes82258 -Node: Distributing85433 -Node: Invoking libtoolize86350 -Node: Autoconf and LTLIBOBJS91388 -Node: Static-only libraries92132 -Ref: Static-only libraries-Footnote-193459 -Node: Other languages93568 -Node: C++ libraries94276 -Node: Tags95714 -Node: Versioning97106 -Node: Interfaces98474 -Node: Libtool versioning99107 -Node: Updating version info101320 -Node: Release numbers103198 -Node: Library tips105054 -Node: C header files107860 -Ref: C header files-Footnote-1111537 -Node: Inter-library dependencies111746 -Node: Dlopened modules114410 -Node: Building modules116314 -Node: Dlpreopening117515 -Node: Linking with dlopened modules123444 -Node: Finding the dlname128373 -Ref: Finding the dlname-Footnote-1129691 -Node: Dlopen issues129744 -Node: Using libltdl130799 -Node: Libltdl interface132640 -Ref: Libltdl interface-Footnote-1145436 -Node: Modules for libltdl145730 -Node: Thread Safety in libltdl148254 -Node: User defined module data149267 -Node: Module loaders for libltdl156759 -Ref: Module loaders for libltdl-Footnote-1166002 -Node: Distributing libltdl166108 -Ref: Distributing libltdl-Footnote-1179868 -Ref: Distributing libltdl-Footnote-2180164 -Node: Trace interface180314 -Node: Troubleshooting181162 -Node: Libtool test suite181697 -Node: Test descriptions182475 -Node: When tests fail191477 -Node: Reporting bugs192669 -Node: Maintaining194287 -Node: New ports195030 -Node: Information sources195723 -Node: Porting inter-library dependencies198191 -Node: Tested platforms200915 -Node: Platform quirks209345 -Node: References210325 -Node: Compilers211175 -Ref: Compilers-Footnote-1212751 -Node: Reloadable objects213067 -Node: Multiple dependencies213426 -Node: Archivers214323 -Node: libtool script contents214889 -Node: Cheap tricks232254 -Node: GNU Free Documentation License234121 -Node: Index256552 +Node: Top876 +Node: Introduction7115 +Node: Motivation8937 +Node: Issues10257 +Node: Other implementations11735 +Node: Postmortem12278 +Node: Libtool paradigm13898 +Node: Using libtool14843 +Node: Creating object files16946 +Node: Linking libraries20683 +Ref: Linking libraries-Footnote-124511 +Node: Linking executables24652 +Ref: Linking executables-Footnote-129730 +Ref: Linking executables-Footnote-230023 +Node: Debugging executables30103 +Node: Installing libraries32926 +Ref: Installing libraries-Footnote-136088 +Node: Installing executables36159 +Node: Static libraries36995 +Node: Invoking libtool40258 +Node: Compile mode43639 +Node: Link mode46678 +Node: Execute mode54604 +Node: Install mode55384 +Node: Finish mode57737 +Node: Uninstall mode58172 +Node: Clean mode58613 +Node: Integrating libtool59072 +Node: Autoconf macros59829 +Node: Makefile rules63676 +Node: Using Automake64779 +Ref: Using Automake-Footnote-166360 +Node: Configuring66756 +Node: LT_INIT68008 +Ref: LT_INIT-Footnote-182108 +Node: Configure notes82361 +Node: Distributing85536 +Node: Invoking libtoolize86453 +Node: Autoconf and LTLIBOBJS91491 +Node: Static-only libraries92235 +Ref: Static-only libraries-Footnote-193562 +Node: Other languages93671 +Node: C++ libraries94379 +Node: Tags95817 +Node: Versioning97209 +Node: Interfaces98577 +Node: Libtool versioning99210 +Node: Updating version info101423 +Node: Release numbers103301 +Node: Library tips105157 +Node: C header files107963 +Ref: C header files-Footnote-1111640 +Node: Inter-library dependencies111849 +Node: Dlopened modules114513 +Node: Building modules116419 +Node: Dlpreopening117620 +Node: Linking with dlopened modules123549 +Node: Finding the dlname128478 +Ref: Finding the dlname-Footnote-1129796 +Node: Dlopen issues129849 +Node: Using libltdl130904 +Node: Libltdl interface132745 +Ref: Libltdl interface-Footnote-1145541 +Node: Modules for libltdl145835 +Node: Thread Safety in libltdl148359 +Node: User defined module data149372 +Node: Module loaders for libltdl156864 +Ref: Module loaders for libltdl-Footnote-1166107 +Node: Distributing libltdl166213 +Ref: Distributing libltdl-Footnote-1179973 +Ref: Distributing libltdl-Footnote-2180269 +Node: Trace interface180419 +Node: Troubleshooting181267 +Node: Libtool test suite181802 +Node: Test descriptions182580 +Node: When tests fail191582 +Node: Reporting bugs192774 +Node: Maintaining194392 +Node: New ports195135 +Node: Information sources195828 +Node: Porting inter-library dependencies198296 +Node: Tested platforms201020 +Node: Platform quirks209450 +Node: References210430 +Node: Compilers211280 +Ref: Compilers-Footnote-1212856 +Node: Reloadable objects213172 +Node: Multiple dependencies213531 +Node: Archivers214428 +Node: libtool script contents214994 +Node: Cheap tricks232359 +Node: GNU Free Documentation License234226 +Node: Index256657  End Tag Table diff -ruNp libtool-2.2/doc/libtool.info-1 libtool-2.2.2/doc/libtool.info-1 --- libtool-2.2/doc/libtool.info-1 2008-03-01 18:05:04.000000000 -0500 +++ libtool-2.2.2/doc/libtool.info-1 2008-04-01 15:02:59.000000000 -0400 @@ -10,7 +10,7 @@ START-INFO-DIR-ENTRY * libtoolize: (libtool)Invoking libtoolize. Adding libtool support. END-INFO-DIR-ENTRY - This file documents GNU Libtool 2.2 + This file documents GNU Libtool 2.2.2 Copyright (C) 1996-2008 Free Software Foundation, Inc. @@ -29,7 +29,7 @@ Shared library support for GNU This file documents GNU Libtool, a script that allows package developers to provide generic shared library support. This edition documents -version 2.2. +version 2.2.2. *Note Reporting bugs::, for information on how to report problems with GNU Libtool. @@ -451,7 +451,7 @@ library. On `a23', only static librarie objects look like this: # foo.lo - a libtool object file - # Generated by ltmain.sh (GNU libtool) 2.2 + # Generated by ltmain.sh (GNU libtool) 2.2.2 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -480,7 +480,7 @@ to build them, Libtool has compiled a PI note of it in the libtool object: # foo.lo - a libtool object file - # Generated by ltmain.sh (GNU libtool) 2.2 + # Generated by ltmain.sh (GNU libtool) 2.2.2 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -1176,7 +1176,8 @@ output file (with the `-o' flag) from se `-all-static' If OUTPUT-FILE is a program, then do not link it against any shared libraries at all. If OUTPUT-FILE is a library, then only - create a static library. + create a static library. In general, this flag cannot be used + together with `disable-static' (*note LT_INIT::). `-avoid-version' Tries to avoid versioning (*note Versioning::) for libraries and @@ -1704,7 +1705,7 @@ a number of macros defined by Libtool: print an error message to the standard error output and exit with failure (exit status is 63). For example: - LT_PREREQ([2.2]) + LT_PREREQ([2.2.2]) -- Macro: LT_INIT (OPTIONS) -- Macro: AC_PROG_LIBTOOL @@ -2855,7 +2856,7 @@ interpreted language. In fact, dlopen c language interpreters to provide an efficient way to extend the language. - As of version 2.2, libtool provides support for dlopened modules. + As of version 2.2.2, libtool provides support for dlopened modules. However, you should indicate that your package is willing to use such support, by using the `LT_INIT' option `dlopen' in `configure.ac'. If this option is not given, libtool will assume no dlopening mechanism is @@ -3884,7 +3885,7 @@ The following types are defined in `ltdl dlloader.sym_prefix = NULL; dlloader.module_open = myloader_open; dlloader.module_close = myloader_close; - dlloader.find_sym = myloader_find_sym. + dlloader.find_sym = myloader_find_sym; dlloader.dlloader_exit = myloader_exit; dlloader.dlloader_data = (lt_user_data)myloader_function; @@ -6343,7 +6344,7 @@ Index (line 6) * linking, dlpreopen: Linking with dlopened modules. (line 6) -* linking, partial: Link mode. (line 180) +* linking, partial: Link mode. (line 181) * LN_S: LT_INIT. (line 254) * LT_CMD_MAX_LEN: Autoconf macros. (line 15) * LT_CONFIG_LTDL_DIR: Distributing libltdl. @@ -6538,7 +6539,7 @@ Index * options, libtool command: Invoking libtool. (line 6) * options, libtoolize command: Invoking libtoolize. (line 6) * other implementations, flaws in: Postmortem. (line 6) -* partial linking: Link mode. (line 180) +* partial linking: Link mode. (line 181) * pass_all: Porting inter-library dependencies. (line 32) * pdemo-conf.test: Test descriptions. (line 169) diff -ruNp libtool-2.2/doc/libtool.texi libtool-2.2.2/doc/libtool.texi --- libtool-2.2/doc/libtool.texi 2008-01-24 09:41:21.000000000 -0500 +++ libtool-2.2.2/doc/libtool.texi 2008-04-01 14:06:08.000000000 -0400 @@ -1322,7 +1322,8 @@ The following components of @var{mode-ar @item -all-static If @var{output-file} is a program, then do not link it against any shared libraries at all. If @var{output-file} is a library, then only -create a static library. +create a static library. In general, this flag cannot be used together +with @samp{disable-static} (@pxref{LT_INIT}). @item -avoid-version Tries to avoid versioning (@pxref{Versioning}) for libraries and modules, @@ -4226,7 +4227,7 @@ register_myloader (void) dlloader.sym_prefix = NULL; dlloader.module_open = myloader_open; dlloader.module_close = myloader_close; - dlloader.find_sym = myloader_find_sym. + dlloader.find_sym = myloader_find_sym; dlloader.dlloader_exit = myloader_exit; dlloader.dlloader_data = (lt_user_data)myloader_function; diff -ruNp libtool-2.2/doc/stamp-vti libtool-2.2.2/doc/stamp-vti --- libtool-2.2/doc/stamp-vti 2008-03-01 19:12:27.000000000 -0500 +++ libtool-2.2.2/doc/stamp-vti 2008-04-01 20:22:59.000000000 -0400 @@ -1,4 +1,4 @@ -@set UPDATED 24 January 2008 -@set UPDATED-MONTH January 2008 -@set EDITION 2.2 -@set VERSION 2.2 +@set UPDATED 1 April 2008 +@set UPDATED-MONTH April 2008 +@set EDITION 2.2.2 +@set VERSION 2.2.2 diff -ruNp libtool-2.2/doc/version.texi libtool-2.2.2/doc/version.texi --- libtool-2.2/doc/version.texi 2008-03-01 18:02:21.000000000 -0500 +++ libtool-2.2.2/doc/version.texi 2008-04-01 15:00:15.000000000 -0400 @@ -1,4 +1,4 @@ -@set UPDATED 24 January 2008 -@set UPDATED-MONTH January 2008 -@set EDITION 2.2 -@set VERSION 2.2 +@set UPDATED 1 April 2008 +@set UPDATED-MONTH April 2008 +@set EDITION 2.2.2 +@set VERSION 2.2.2 diff -ruNp libtool-2.2/libltdl/Makefile.am libtool-2.2.2/libltdl/Makefile.am --- libtool-2.2/libltdl/Makefile.am 2008-02-01 13:37:35.000000000 -0500 +++ libtool-2.2.2/libltdl/Makefile.am 2008-04-01 15:00:15.000000000 -0400 @@ -47,7 +47,7 @@ AM_CPPFLAGS += -DLT_CONFIG_H='<$( -DLTDL -I. -I$(srcdir) -Ilibltdl \ -I$(srcdir)/libltdl -I$(srcdir)/libltdl AM_LDFLAGS += -no-undefined -LTDL_VERSION_INFO = -version-info 8:0:1 +LTDL_VERSION_INFO = -version-info 8:1:1 noinst_LTLIBRARIES += $(LT_DLLOADERS) diff -ruNp libtool-2.2/libltdl/Makefile.in libtool-2.2.2/libltdl/Makefile.in --- libtool-2.2/libltdl/Makefile.in 2008-03-01 19:12:33.000000000 -0500 +++ libtool-2.2.2/libltdl/Makefile.in 2008-04-01 20:22:59.000000000 -0400 @@ -300,7 +300,7 @@ EXTRA_DIST = lt__dirent.c lt__strl.c COP CLEANFILES = libltdl.la libltdlc.la libdlloader.la $(LIBOBJS) \ $(LTLIBOBJS) MOSTLYCLEANFILES = argz.h argz.h-t -LTDL_VERSION_INFO = -version-info 8:0:1 +LTDL_VERSION_INFO = -version-info 8:1:1 @INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl @INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = libltdl/lt_system.h \ @INSTALL_LTDL_TRUE@ libltdl/lt_error.h \ diff -ruNp libtool-2.2/libltdl/Makefile.inc libtool-2.2.2/libltdl/Makefile.inc --- libtool-2.2/libltdl/Makefile.inc 2008-02-01 13:37:17.000000000 -0500 +++ libtool-2.2.2/libltdl/Makefile.inc 2008-04-01 14:36:25.000000000 -0400 @@ -36,7 +36,7 @@ AM_CPPFLAGS += -DLT_CONFIG_H='<$( -DLTDL -I. -I$(srcdir) -Ilibltdl \ -I$(srcdir)/libltdl -I$(srcdir)/libltdl/libltdl AM_LDFLAGS += -no-undefined -LTDL_VERSION_INFO = -version-info 8:0:1 +LTDL_VERSION_INFO = -version-info 8:1:1 noinst_LTLIBRARIES += $(LT_DLLOADERS) diff -ruNp libtool-2.2/libltdl/config/config.guess libtool-2.2.2/libltdl/config/config.guess --- libtool-2.2/libltdl/config/config.guess 2008-03-01 12:50:59.000000000 -0500 +++ libtool-2.2.2/libltdl/config/config.guess 2008-04-01 20:20:52.000000000 -0400 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2008-01-08' # 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 @@ -1484,9 +1484,9 @@ This script, last modified $timestamp, h the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -ruNp libtool-2.2/libltdl/config/general.m4sh libtool-2.2.2/libltdl/config/general.m4sh --- libtool-2.2/libltdl/config/general.m4sh 2008-01-30 07:00:55.000000000 -0500 +++ libtool-2.2.2/libltdl/config/general.m4sh 2008-04-01 14:06:08.000000000 -0400 @@ -1,6 +1,6 @@ m4_if([general.m4sh -- general shell script boiler plate -*- Autoconf -*- - Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. Written by Gary V. Vaughan, 2004 This file is part of GNU Cvs-utils. @@ -344,5 +344,31 @@ func_show_eval () fi fi } + + +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} ]]) diff -ruNp libtool-2.2/libltdl/config/ltmain.m4sh libtool-2.2.2/libltdl/config/ltmain.m4sh --- libtool-2.2/libltdl/config/ltmain.m4sh 2008-03-01 12:25:10.000000000 -0500 +++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-04-01 20:20:54.000000000 -0400 @@ -96,12 +96,16 @@ DUALCASE=1; export DUALCASE # for MKS sh # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). +lt_user_locale= +lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${$lt_var+set}\" = set; then save_$lt_var=\$$lt_var $lt_var=C export $lt_var + lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done @@ -648,7 +652,7 @@ func_lalib_p () func_lalib_unsafe_p () { lalib_p=no - if test -r "$1" && exec 5<&1 <"$1"; then + if test -r "$1" && exec 5<&0 <"$1"; then for lalib_p_l in 1 2 3 4 do read lalib_p_line @@ -656,7 +660,7 @@ func_lalib_unsafe_p () \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done - exec 1<&5 5<&- + exec 0<&5 5<&- fi test "$lalib_p" = yes } @@ -1515,7 +1519,7 @@ compiler." $opt_dry_run || $RM "$lobj" "$output_obj" - func_show_eval "$command" \ + func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' if test "$need_locks" = warn && @@ -1565,7 +1569,7 @@ compiler." # Suppress compiler output if we already did a PIC compilation. command="$command$suppress_output" $opt_dry_run || $RM "$obj" "$output_obj" - func_show_eval "$command" \ + func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' if test "$need_locks" = warn && @@ -1694,12 +1698,14 @@ func_mode_execute () # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then func_source "$file" + # Transform arg to wrapped name. + file="$progdir/$program" elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file="$progdir/$program" fi - # Transform arg to wrapped name. - file="$progdir/$program" ;; esac # Quote arguments (to preserve shell metacharacters). @@ -2468,7 +2474,7 @@ else ;; esac $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 exit 1 fi else @@ -2511,6 +2517,7 @@ EOF #ifdef _MSC_VER # include # include +# include #else # include # include @@ -2521,6 +2528,7 @@ EOF #include #include #include +#include #include #if defined(PATH_MAX) @@ -2554,6 +2562,7 @@ EOF #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) # define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 # define DIR_SEPARATOR_2 '\\' # endif @@ -2575,6 +2584,17 @@ EOF # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif + +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ @@ -2640,6 +2660,15 @@ main (int argc, char *argv[]) { if (strcmp (argv[i], dumpscript_opt) == 0) { +EOF + case "$host" in + *mingw* | *cygwin* ) + # make stdout use "unix" line endings + echo " _setmode(1,_O_BINARY);" + ;; + esac + + cat < $func_ltwrapper_scriptname_result + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host" ; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi } ;; * ) diff -ruNp libtool-2.2/libltdl/config/ltmain.sh libtool-2.2.2/libltdl/config/ltmain.sh --- libtool-2.2/libltdl/config/ltmain.sh 2008-03-01 19:12:27.000000000 -0500 +++ libtool-2.2.2/libltdl/config/ltmain.sh 2008-04-01 20:22:59.000000000 -0400 @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2 +# ltmain.sh (GNU libtool) 2.2.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2 +# $progname: (GNU libtool) 2.2.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2 +VERSION=2.2.2 TIMESTAMP="" -package_revision=1.2599 +package_revision=1.2627 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -95,12 +95,16 @@ DUALCASE=1; export DUALCASE # for MKS sh # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). +lt_user_locale= +lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${$lt_var+set}\" = set; then save_$lt_var=\$$lt_var $lt_var=C export $lt_var + lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done @@ -120,7 +124,7 @@ $lt_unset CDPATH : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/usr/bin/sed"} +: ${SED="/opt/local/bin/gsed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -425,6 +429,32 @@ func_show_eval () } +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} + + @@ -1030,7 +1060,7 @@ func_lalib_p () func_lalib_unsafe_p () { lalib_p=no - if test -r "$1" && exec 5<&1 <"$1"; then + if test -r "$1" && exec 5<&0 <"$1"; then for lalib_p_l in 1 2 3 4 do read lalib_p_line @@ -1038,7 +1068,7 @@ func_lalib_unsafe_p () \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done - exec 1<&5 5<&- + exec 0<&5 5<&- fi test "$lalib_p" = yes } @@ -1897,7 +1927,7 @@ compiler." $opt_dry_run || $RM "$lobj" "$output_obj" - func_show_eval "$command" \ + func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' if test "$need_locks" = warn && @@ -1947,7 +1977,7 @@ compiler." # Suppress compiler output if we already did a PIC compilation. command="$command$suppress_output" $opt_dry_run || $RM "$obj" "$output_obj" - func_show_eval "$command" \ + func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' if test "$need_locks" = warn && @@ -2076,12 +2106,14 @@ func_mode_execute () # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then func_source "$file" + # Transform arg to wrapped name. + file="$progdir/$program" elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file="$progdir/$program" fi - # Transform arg to wrapped name. - file="$progdir/$program" ;; esac # Quote arguments (to preserve shell metacharacters). @@ -2850,7 +2882,7 @@ else ;; esac $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 exit 1 fi else @@ -2893,6 +2925,7 @@ EOF #ifdef _MSC_VER # include # include +# include #else # include # include @@ -2903,6 +2936,7 @@ EOF #include #include #include +#include #include #if defined(PATH_MAX) @@ -2936,6 +2970,7 @@ EOF #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) # define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 # define DIR_SEPARATOR_2 '\\' # endif @@ -2957,6 +2992,17 @@ EOF # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif + +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ @@ -3022,6 +3068,15 @@ main (int argc, char *argv[]) { if (strcmp (argv[i], dumpscript_opt) == 0) { +EOF + case "$host" in + *mingw* | *cygwin* ) + # make stdout use "unix" line endings + echo " _setmode(1,_O_BINARY);" + ;; + esac + + cat < $func_ltwrapper_scriptname_result + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host" ; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi } ;; * ) diff -ruNp libtool-2.2/libltdl/config/texinfo.tex libtool-2.2.2/libltdl/config/texinfo.tex --- libtool-2.2/libltdl/config/texinfo.tex 2008-03-01 12:50:59.000000000 -0500 +++ libtool-2.2.2/libltdl/config/texinfo.tex 2008-04-01 20:18:45.000000000 -0400 @@ -3,11 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2008-02-28.18} +\def\texinfoversion{2007-12-02.17} % -% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, +% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008 Free Software Foundation, Inc. +% 2007 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -97,7 +97,6 @@ \let\ptexslash=\/ \let\ptexstar=\* \let\ptext=\t -\let\ptextop=\top % If this character appears in an error message or help string, it % starts a new line in the output. @@ -917,18 +916,15 @@ where each line of input produces a line \temp } -% @include FILE -- \input text of FILE. +% @include file insert text of that file as input. % \def\include{\parseargusing\filenamecatcodes\includezzz} \def\includezzz#1{% \pushthisfilestack \def\thisfile{#1}% {% - \makevalueexpandable % we want to expand any @value in FILE. - \edef\temp{\noexpand\input #1 }% - % - % This trickery is to read FILE outside of a group, in case it makes - % definitions, etc. + \makevalueexpandable + \def\temp{\input #1 }% \expandafter }\temp \popthisfilestack @@ -2564,13 +2560,6 @@ end \let\env=\code \let\command=\code -% @clicksequence{File @click{} Open ...} -\def\clicksequence#1{\begingroup #1\endgroup} - -% @clickstyle @arrow (by default) -\parseargdef\clickstyle{\def\click{#1}} -\def\click{\arrow} - % @uref (abbreviation for `urlref') takes an optional (comma-separated) % second argument specifying the text to display and an optional third % arg as text to display instead of (rather than in addition to) the url @@ -5663,15 +5652,14 @@ end % @point{}, @result{}, @expansion{}, @print{}, @equiv{}. % -% Since these characters are used in examples, they should be an even number of +% Since these characters are used in examples, it should be an even number of % \tt widths. Each \tt character is 1en, so two makes it 1em. % \def\point{$\star$} -\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} -\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} -\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} +\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} +\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}} \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} -\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} +\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}} % The @error{} command. % Adapted from the TeXbook's \boxit. @@ -5729,7 +5717,6 @@ end \let\/=\ptexslash \let\*=\ptexstar \let\t=\ptext - \expandafter \let\csname top\endcsname=\ptextop % outer \let\frenchspacing=\plainfrenchspacing % \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% diff -ruNp libtool-2.2/libltdl/configure libtool-2.2.2/libltdl/configure --- libtool-2.2/libltdl/configure 2008-03-01 19:12:34.000000000 -0500 +++ libtool-2.2.2/libltdl/configure 2008-04-01 20:18:56.000000000 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for libltdl 2.2. +# Generated by GNU Autoconf 2.61 for libltdl 2.2.2. # # Report bugs to . # @@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libltdl' PACKAGE_TARNAME='libltdl' -PACKAGE_VERSION='2.2' -PACKAGE_STRING='libltdl 2.2' +PACKAGE_VERSION='2.2.2' +PACKAGE_STRING='libltdl 2.2.2' PACKAGE_BUGREPORT='bug-libtool@gnu.org' ac_unique_file="ltdl.c" @@ -1394,7 +1394,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libltdl 2.2 to adapt to many kinds of systems. +\`configure' configures libltdl 2.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1464,7 +1464,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libltdl 2.2:";; + short | recursive ) echo "Configuration of libltdl 2.2.2:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libltdl configure 2.2 +libltdl configure 2.2.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1575,7 +1575,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libltdl $as_me 2.2, which was +It was created by libltdl $as_me 2.2.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2281,7 +2281,7 @@ fi # Define the identity of the package. PACKAGE='libltdl' - VERSION='2.2' + VERSION='2.2.2' cat >>confdefs.h <<_ACEOF @@ -2446,8 +2446,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -4110,7 +4110,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -4289,13 +4288,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4292: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4291: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4295: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4294: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4298: output\"" >&5) + (eval echo "\"\$as_me:4297: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4450,7 +4449,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5405,7 +5403,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5408 "configure"' > conftest.$ac_ext + echo '#line 5406 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5809,14 +5807,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -7256,11 +7260,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7259: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7263: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7263: \$? = $ac_status" >&5 + echo "$as_me:7267: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7310,12 +7314,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -7574,11 +7584,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7577: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7587: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7581: \$? = $ac_status" >&5 + echo "$as_me:7591: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7679,11 +7689,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7682: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7692: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7686: \$? = $ac_status" >&5 + echo "$as_me:7696: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7734,11 +7744,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7737: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7747: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7741: \$? = $ac_status" >&5 + echo "$as_me:7751: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7900,19 +7910,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -8371,13 +8380,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -9211,13 +9225,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -10473,7 +10492,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10476 "configure" +#line 10495 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10573,7 +10592,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10576 "configure" +#line 10595 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11623,7 +11642,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11626 "configure" +#line 11645 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11740,6 +11759,13 @@ else aix[4-9]*) lt_cv_sys_dlopen_deplibs=yes ;; + amigaos*) + case $host_cpu in + powerpc) + lt_cv_sys_dlopen_deplibs=no + ;; + esac + ;; darwin*) # Assuming the user has installed a libdl from somewhere, this is true # If you are looking for one http://www.opendarwin.org/projects/dlcompat @@ -12900,7 +12926,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libltdl $as_me 2.2, which was +This file was extended by libltdl $as_me 2.2.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12953,7 +12979,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libltdl config.status 2.2 +libltdl config.status 2.2.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -14127,7 +14153,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/libltdl/configure.ac libtool-2.2.2/libltdl/configure.ac --- libtool-2.2/libltdl/configure.ac 2008-03-01 17:54:27.000000000 -0500 +++ libtool-2.2.2/libltdl/configure.ac 2008-04-01 14:23:49.000000000 -0400 @@ -40,7 +40,7 @@ AC_PREREQ(2.59)dnl We use AS_HELP_STRING ## ------------------------ ## ## Autoconf initialisation. ## ## ------------------------ ## -AC_INIT([libltdl], [2.2], [bug-libtool@gnu.org]) +AC_INIT([libltdl], [2.2.2], [bug-libtool@gnu.org]) AC_CONFIG_HEADERS([config.h:config-h.in]) AC_CONFIG_SRCDIR([ltdl.c]) AC_CONFIG_AUX_DIR([config]) diff -ruNp libtool-2.2/libltdl/loaders/dld_link.c libtool-2.2.2/libltdl/loaders/dld_link.c --- libtool-2.2/libltdl/loaders/dld_link.c 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/libltdl/loaders/dld_link.c 2008-03-06 22:06:59.000000000 -0500 @@ -1,7 +1,7 @@ /* loader-dld_link.c -- dynamic linking with dld Copyright (C) 1998, 1999, 2000, 2004, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008 Free Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the @@ -45,20 +45,21 @@ LT_END_C_DECLS /* Boilerplate code to set up the vtable for hooking this loader into libltdl's loader list: */ +static int vl_exit (lt_user_data loader_data); static lt_module vm_open (lt_user_data loader_data, const char *filename, lt_dladvise advise); static int vm_close (lt_user_data loader_data, lt_module module); static void * vm_sym (lt_user_data loader_data, lt_module module, const char *symbolname); +static lt_dlvtable *vtable = 0; + /* Return the vtable for this loader, only the name and sym_prefix attributes (plus the virtual function implementations, obviously) change between loaders. */ lt_dlvtable * get_vtable (lt_user_data loader_data) { - static lt_dlvtable *vtable = 0; - if (!vtable) { vtable = lt__zalloc (sizeof *vtable); @@ -70,6 +71,7 @@ get_vtable (lt_user_data loader_data) vtable->module_open = vm_open; vtable->module_close = vm_close; vtable->find_sym = vm_sym; + vtable->dlloader_exit = vl_exit; vtable->dlloader_data = loader_data; vtable->priority = LT_DLLOADER_APPEND; } @@ -92,6 +94,15 @@ get_vtable (lt_user_data loader_data) # include #endif +/* A function called through the vtable when this loader is no + longer needed by the application. */ +static int +vl_exit (lt_user_data LT__UNUSED loader_data) +{ + vtable = NULL; + return 0; +} + /* A function called through the vtable to open a module with this loader. Returns an opaque representation of the newly opened module for processing with this loader's other vtable functions. */ diff -ruNp libtool-2.2/libltdl/loaders/dlopen.c libtool-2.2.2/libltdl/loaders/dlopen.c --- libtool-2.2/libltdl/loaders/dlopen.c 2008-01-16 22:58:33.000000000 -0500 +++ libtool-2.2.2/libltdl/loaders/dlopen.c 2008-03-06 22:06:59.000000000 -0500 @@ -45,20 +45,21 @@ LT_END_C_DECLS /* Boilerplate code to set up the vtable for hooking this loader into libltdl's loader list: */ +static int vl_exit (lt_user_data loader_data); static lt_module vm_open (lt_user_data loader_data, const char *filename, lt_dladvise advise); static int vm_close (lt_user_data loader_data, lt_module module); static void * vm_sym (lt_user_data loader_data, lt_module module, const char *symbolname); +static lt_dlvtable *vtable = 0; + /* Return the vtable for this loader, only the name and sym_prefix attributes (plus the virtual function implementations, obviously) change between loaders. */ lt_dlvtable * get_vtable (lt_user_data loader_data) { - static lt_dlvtable *vtable = 0; - if (!vtable) { vtable = (lt_dlvtable *) lt__zalloc (sizeof *vtable); @@ -73,6 +74,7 @@ get_vtable (lt_user_data loader_data) vtable->module_open = vm_open; vtable->module_close = vm_close; vtable->find_sym = vm_sym; + vtable->dlloader_exit = vl_exit; vtable->dlloader_data = loader_data; vtable->priority = LT_DLLOADER_PREPEND; } @@ -146,6 +148,17 @@ get_vtable (lt_user_data loader_data) #define DL__SETERROR(errorcode) \ LT__SETERRORSTR (DLERROR (errorcode)) + +/* A function called through the vtable when this loader is no + longer needed by the application. */ +static int +vl_exit (lt_user_data LT__UNUSED loader_data) +{ + vtable = NULL; + return 0; +} + + /* A function called through the vtable to open a module with this loader. Returns an opaque representation of the newly opened module for processing with this loader's other vtable functions. */ diff -ruNp libtool-2.2/libltdl/loaders/dyld.c libtool-2.2.2/libltdl/loaders/dyld.c --- libtool-2.2/libltdl/loaders/dyld.c 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/libltdl/loaders/dyld.c 2008-03-06 22:06:59.000000000 -0500 @@ -1,7 +1,7 @@ /* loader-dyld.c -- dynamic linking on darwin and OS X Copyright (C) 1998, 1999, 2000, 2004, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008 Free Software Foundation, Inc. Written by Peter O'Gorman, 1998 NOTE: The canonical source of this file is maintained with the @@ -53,14 +53,14 @@ static int vm_close (lt_user_data loade static void * vm_sym (lt_user_data loader_data, lt_module module, const char *symbolname); +static lt_dlvtable *vtable = 0; + /* Return the vtable for this loader, only the name and sym_prefix attributes (plus the virtual function implementations, obviously) change between loaders. */ lt_dlvtable * get_vtable (lt_user_data loader_data) { - static lt_dlvtable *vtable = 0; - if (!vtable) { vtable = lt__zalloc (sizeof *vtable); @@ -74,6 +74,7 @@ get_vtable (lt_user_data loader_data) vtable->module_open = vm_open; vtable->module_close = vm_close; vtable->find_sym = vm_sym; + vtable->dlloader_exit = vl_exit; vtable->dlloader_data = loader_data; vtable->priority = LT_DLLOADER_APPEND; } @@ -181,6 +182,15 @@ static enum DYLD_BOOL (*lt__module_expor static int dyld_cannot_close = 0; +/* A function called through the vtable when this loader is no + longer needed by the application. */ +static int +vl_exit (lt_user_data LT__UNUSED loader_data) +{ + vtable = NULL; + return 0; +} + /* A function called through the vtable to initialise this loader. */ static int vl_init (lt_user_data loader_data) diff -ruNp libtool-2.2/libltdl/loaders/load_add_on.c libtool-2.2.2/libltdl/loaders/load_add_on.c --- libtool-2.2/libltdl/loaders/load_add_on.c 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/libltdl/loaders/load_add_on.c 2008-03-06 22:06:59.000000000 -0500 @@ -1,7 +1,7 @@ /* loader-load_add_on.c -- dynamic linking for BeOS Copyright (C) 1998, 1999, 2000, 2004, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008 Free Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the @@ -45,20 +45,21 @@ LT_END_C_DECLS /* Boilerplate code to set up the vtable for hooking this loader into libltdl's loader list: */ +static int vl_exit (lt_user_data loader_data); static lt_module vm_open (lt_user_data loader_data, const char *filename, lt_dladvise advise); static int vm_close (lt_user_data loader_data, lt_module module); static void * vm_sym (lt_user_data loader_data, lt_module module, const char *symbolname); +static lt_dlvtable *vtable = 0; + /* Return the vtable for this loader, only the name and sym_prefix attributes (plus the virtual function implementations, obviously) change between loaders. */ lt_dlvtable * get_vtable (lt_user_data loader_data) { - static lt_dlvtable *vtable = 0; - if (!vtable) { vtable = lt__zalloc (sizeof *vtable); @@ -70,6 +71,7 @@ get_vtable (lt_user_data loader_data) vtable->module_open = vm_open; vtable->module_close = vm_close; vtable->find_sym = vm_sym; + vtable->dlloader_exit = vl_exit; vtable->dlloader_data = loader_data; vtable->priority = LT_DLLOADER_APPEND; } @@ -90,6 +92,15 @@ get_vtable (lt_user_data loader_data) #include +/* A function called through the vtable when this loader is no + longer needed by the application. */ +static int +vl_exit (lt_user_data LT__UNUSED loader_data) +{ + vtable = NULL; + return 0; +} + /* A function called through the vtable to open a module with this loader. Returns an opaque representation of the newly opened module for processing with this loader's other vtable functions. */ diff -ruNp libtool-2.2/libltdl/loaders/loadlibrary.c libtool-2.2.2/libltdl/loaders/loadlibrary.c --- libtool-2.2/libltdl/loaders/loadlibrary.c 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/libltdl/loaders/loadlibrary.c 2008-03-06 22:06:59.000000000 -0500 @@ -1,7 +1,7 @@ /* loader-loadlibrary.c -- dynamic linking for Win32 Copyright (C) 1998, 1999, 2000, 2004, 2005, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008 Free Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the @@ -49,6 +49,7 @@ LT_END_C_DECLS /* Boilerplate code to set up the vtable for hooking this loader into libltdl's loader list: */ +static int vl_exit (lt_user_data loader_data); static lt_module vm_open (lt_user_data loader_data, const char *filename, lt_dladvise advise); static int vm_close (lt_user_data loader_data, lt_module module); @@ -56,6 +57,7 @@ static void * vm_sym (lt_user_data lo const char *symbolname); static lt_dlinterface_id iface_id = 0; +static lt_dlvtable *vtable = 0; /* Return the vtable for this loader, only the name and sym_prefix attributes (plus the virtual function implementations, obviously) @@ -63,8 +65,6 @@ static lt_dlinterface_id iface_id = 0; lt_dlvtable * get_vtable (lt_user_data loader_data) { - static lt_dlvtable *vtable = 0; - if (!vtable) { vtable = (lt_dlvtable *) lt__zalloc (sizeof *vtable); @@ -77,6 +77,7 @@ get_vtable (lt_user_data loader_data) vtable->module_open = vm_open; vtable->module_close = vm_close; vtable->find_sym = vm_sym; + vtable->dlloader_exit = vl_exit; vtable->dlloader_data = loader_data; vtable->priority = LT_DLLOADER_APPEND; } @@ -97,6 +98,15 @@ get_vtable (lt_user_data loader_data) #include +/* A function called through the vtable when this loader is no + longer needed by the application. */ +static int +vl_exit (lt_user_data LT__UNUSED loader_data) +{ + vtable = NULL; + return 0; +} + /* A function called through the vtable to open a module with this loader. Returns an opaque representation of the newly opened module for processing with this loader's other vtable functions. */ diff -ruNp libtool-2.2/libltdl/loaders/preopen.c libtool-2.2.2/libltdl/loaders/preopen.c --- libtool-2.2/libltdl/loaders/preopen.c 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/libltdl/loaders/preopen.c 2008-03-06 22:06:59.000000000 -0500 @@ -1,7 +1,7 @@ /* loader-preopen.c -- emulate dynamic linking using preloaded_symbols Copyright (C) 1998, 1999, 2000, 2004, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008 Free Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the @@ -53,14 +53,14 @@ static int vm_close (lt_user_data loade static void * vm_sym (lt_user_data loader_data, lt_module module, const char *symbolname); +static lt_dlvtable *vtable = 0; + /* Return the vtable for this loader, only the name and sym_prefix attributes (plus the virtual function implementations, obviously) change between loaders. */ lt_dlvtable * get_vtable (lt_user_data loader_data) { - static lt_dlvtable *vtable = 0; - if (!vtable) { vtable = (lt_dlvtable *) lt__zalloc (sizeof *vtable); @@ -132,6 +132,7 @@ vl_init (lt_user_data LT__UNUSED loader_ static int vl_exit (lt_user_data LT__UNUSED loader_data) { + vtable = NULL; free_symlists (); return 0; } diff -ruNp libtool-2.2/libltdl/loaders/shl_load.c libtool-2.2.2/libltdl/loaders/shl_load.c --- libtool-2.2/libltdl/loaders/shl_load.c 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/libltdl/loaders/shl_load.c 2008-03-06 22:06:59.000000000 -0500 @@ -1,7 +1,7 @@ /* loader-shl_load.c -- dynamic linking with shl_load (HP-UX) Copyright (C) 1998, 1999, 2000, 2004, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008 Free Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the @@ -45,20 +45,21 @@ LT_END_C_DECLS /* Boilerplate code to set up the vtable for hooking this loader into libltdl's loader list: */ +static int vl_exit (lt_user_data loader_data); static lt_module vm_open (lt_user_data loader_data, const char *filename, lt_dladvise advise); static int vm_close (lt_user_data loader_data, lt_module module); static void * vm_sym (lt_user_data loader_data, lt_module module, const char *symbolname); +static lt_dlvtable *vtable = 0; + /* Return the vtable for this loader, only the name and sym_prefix attributes (plus the virtual function implementations, obviously) change between loaders. */ lt_dlvtable * get_vtable (lt_user_data loader_data) { - static lt_dlvtable *vtable = 0; - if (!vtable) { vtable = lt__zalloc (sizeof *vtable); @@ -70,6 +71,7 @@ get_vtable (lt_user_data loader_data) vtable->module_open = vm_open; vtable->module_close = vm_close; vtable->find_sym = vm_sym; + vtable->dlloader_exit = vl_exit; vtable->dlloader_data = loader_data; vtable->priority = LT_DLLOADER_APPEND; } @@ -133,6 +135,15 @@ get_vtable (lt_user_data loader_data) #define LT_BIND_FLAGS (BIND_IMMEDIATE | BIND_NONFATAL | DYNAMIC_PATH) +/* A function called through the vtable when this loader is no + longer needed by the application. */ +static int +vl_exit (lt_user_data LT__UNUSED loader_data) +{ + vtable = NULL; + return 0; +} + /* A function called through the vtable to open a module with this loader. Returns an opaque representation of the newly opened module for processing with this loader's other vtable functions. */ diff -ruNp libtool-2.2/libltdl/m4/libtool.m4 libtool-2.2.2/libltdl/m4/libtool.m4 --- libtool-2.2/libltdl/m4/libtool.m4 2008-02-29 14:45:07.000000000 -0500 +++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-04-01 14:20:04.000000000 -0400 @@ -37,7 +37,7 @@ m4_define([_LT_COPYING], [dnl # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 54 LT_INIT +# serial 55 LT_INIT # LT_PREREQ(VERSION) @@ -57,7 +57,7 @@ m4_defun([LT_PREREQ], m4_defun([_LT_CHECK_BUILDDIR], [case `pwd` in *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in \`pwd\`]) ;; + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; esac ]) @@ -155,9 +155,7 @@ test -z "$LN_S" && LN_S="ln -s" _LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl dnl AC_REQUIRE([LT_CMD_MAX_LEN])dnl -AC_REQUIRE([AC_OBJEXT])dnl _LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -AC_REQUIRE([AC_EXEEXT])dnl _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl @@ -685,7 +683,7 @@ _LT_CONFIG_SAVE_COMMANDS([ #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # @@ -907,14 +905,20 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&AS_MESSAGE_LOG_FD fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi]) AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], @@ -1194,8 +1198,7 @@ _LT_DECL([], [ECHO], [1], # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], -[AC_REQUIRE([AC_OBJEXT])dnl -AC_ARG_ENABLE([libtool-lock], +[AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes @@ -1384,8 +1387,7 @@ _LT_TAGDECL([], [old_archive_cmds], [2], # ---------------------------------------------------------------- # Check whether the given compiler option works AC_DEFUN([_LT_COMPILER_OPTION], -[AC_REQUIRE([AC_OBJEXT])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no @@ -1837,8 +1839,7 @@ dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [ # Check to see if options -c and -o are simultaneously supported by compiler. # This macro does not hard code the compiler like AC_PROG_CC_C_O. m4_defun([_LT_COMPILER_C_O], -[AC_REQUIRE([AC_OBJEXT])dnl -m4_require([_LT_DECL_SED])dnl +[m4_require([_LT_DECL_SED])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_TAG_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], @@ -2155,13 +2156,18 @@ aix[[4-9]]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -3143,7 +3149,6 @@ _LT_DECL([], [file_magic_cmd], [1], # find the pathname to a BSD- or MS-compatible name lister AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_OBJEXT])dnl AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. @@ -3279,7 +3284,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_ m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3531,14 +3535,22 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi ;; + amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -3823,12 +3835,18 @@ m4_if([$1], [CXX], [ ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -4235,19 +4253,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_TAGVAR(ld_shlibs, $1)=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac ;; beos*) @@ -4594,13 +4611,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - # see comment about different semantics on the GNU ld section - _LT_TAGVAR(ld_shlibs, $1)=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac ;; bsdi[[45]]*) @@ -6815,6 +6837,7 @@ GCC=yes CC=${GCJ-"gcj"} compiler=$CC _LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. diff -ruNp libtool-2.2/libltdl/m4/ltdl.m4 libtool-2.2.2/libltdl/m4/ltdl.m4 --- libtool-2.2/libltdl/m4/ltdl.m4 2008-01-31 11:14:56.000000000 -0500 +++ libtool-2.2.2/libltdl/m4/ltdl.m4 2008-04-01 14:20:15.000000000 -0400 @@ -7,7 +7,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 13 LTDL_INIT +# serial 14 LTDL_INIT # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) # ------------------------------------------ @@ -154,7 +154,7 @@ m4_defun([_LTDL_INSTALLABLE], if test x"${lt_lib_ltdl-no}" = xyes; then if test x"$enable_ltdl_install" != xyes; then # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install - AC_MSG_WARN([not overwriting libltdl at $prefix, force with \`--enable-ltdl-install']) + AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install']) enable_ltdl_install=no fi elif test x"$enable_ltdl_install" = xno; then @@ -287,7 +287,7 @@ AC_ARG_WITH([ltdl_include], if test -n "$with_ltdl_include"; then if test -f "$with_ltdl_include/ltdl.h"; then : else - AC_MSG_ERROR([invalid ltdl include directory: \`$with_ltdl_include']) + AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include']) fi else with_ltdl_include=no @@ -300,7 +300,7 @@ AC_ARG_WITH([ltdl_lib], if test -n "$with_ltdl_lib"; then if test -f "$with_ltdl_lib/libltdl.la"; then : else - AC_MSG_ERROR([invalid ltdl library directory: \`$with_ltdl_lib']) + AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib']) fi else with_ltdl_lib=no @@ -323,7 +323,7 @@ case ,$with_included_ltdl,$with_ltdl_inc LTDLINCL= ;; ,no*,no,*) - AC_MSG_ERROR([\`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together]) + AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together]) ;; *) with_included_ltdl=no LIBLTDL="-L$with_ltdl_lib -lltdl" @@ -472,6 +472,13 @@ AC_CACHE_CHECK([whether deplibs are load aix[[4-9]]*) lt_cv_sys_dlopen_deplibs=yes ;; + amigaos*) + case $host_cpu in + powerpc) + lt_cv_sys_dlopen_deplibs=no + ;; + esac + ;; darwin*) # Assuming the user has installed a libdl from somewhere, this is true # If you are looking for one http://www.opendarwin.org/projects/dlcompat diff -ruNp libtool-2.2/libltdl/m4/ltoptions.m4 libtool-2.2.2/libltdl/m4/ltoptions.m4 --- libtool-2.2/libltdl/m4/ltoptions.m4 2008-02-12 04:36:44.000000000 -0500 +++ libtool-2.2.2/libltdl/m4/ltoptions.m4 2008-04-01 14:20:29.000000000 -0400 @@ -7,7 +7,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 4 ltoptions.m4 +# serial 5 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -143,7 +143,8 @@ _LT_DECL([], [OBJDUMP], [0], [Object dum ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[_LT_SET_OPTION([LT_INIT], [win32-dll]) +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put the `win32-dll' option into LT_INIT's first parameter.]) diff -ruNp libtool-2.2/libltdl/m4/ltversion.m4 libtool-2.2.2/libltdl/m4/ltversion.m4 --- libtool-2.2/libltdl/m4/ltversion.m4 2008-03-01 19:11:18.000000000 -0500 +++ libtool-2.2.2/libltdl/m4/ltversion.m4 2008-04-01 20:18:21.000000000 -0400 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 2599 ltversion.m4 +# serial 2627 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2]) -m4_define([LT_PACKAGE_REVISION], [1.2599]) +m4_define([LT_PACKAGE_VERSION], [2.2.2]) +m4_define([LT_PACKAGE_REVISION], [1.2627]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2' -macro_revision='1.2599' +[macro_version='2.2.2' +macro_revision='1.2627' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -ruNp libtool-2.2/libltdl/slist.c libtool-2.2.2/libltdl/slist.c --- libtool-2.2/libltdl/slist.c 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/libltdl/slist.c 2008-03-06 22:06:59.000000000 -0500 @@ -1,6 +1,6 @@ /* slist.c -- generalised singly linked lists - Copyright (C) 2000, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2000, 2004, 2007, 2008 Free Software Foundation, Inc. Written by Gary V. Vaughan, 2000 NOTE: The canonical source of this file is maintained with the @@ -140,15 +140,18 @@ slist_find (SList *slist, SListCallback SList * slist_concat (SList *head, SList *tail) { + SList *last; + if (!head) { return tail; } - while (head->next) - head = head->next; + last = head; + while (last->next) + last = last->next; - head->next = tail; + last->next = tail; return head; } diff -ruNp libtool-2.2/libtoolize.in libtool-2.2.2/libtoolize.in --- libtool-2.2/libtoolize.in 2008-02-29 15:13:50.000000000 -0500 +++ libtool-2.2.2/libtoolize.in 2008-04-01 15:00:15.000000000 -0400 @@ -68,7 +68,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -90,17 +90,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -116,8 +144,6 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -140,7 +166,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -153,17 +179,10 @@ PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -185,7 +204,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -524,6 +543,32 @@ func_show_eval () } +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} + + diff -ruNp libtool-2.2/tests/am-subdir.at libtool-2.2.2/tests/am-subdir.at --- libtool-2.2/tests/am-subdir.at 2008-01-16 22:58:34.000000000 -0500 +++ libtool-2.2.2/tests/am-subdir.at 2008-04-01 14:06:09.000000000 -0400 @@ -101,18 +101,6 @@ AM_PROG_CC_C_O AC_PROG_CXX AC_PROG_CXXCPP -# As of the writing of this demo, GNU Autoconf's AC_OBJEXT and -# AC_EXEEXT macros only works for C compilers! -# Libtool's setup macro calls AC_OBJEXT and AC_EXEEXT without setting -# the test language to C. We do it before any libtool setup macros are -# called so that the proper values are cached beforehand. We also do -# it before any linker flags (LDFLAGS) are set so that C++ specific -# ones don't break the tests. -AC_LANG_PUSH([C]) -AC_OBJEXT -AC_EXEEXT -AC_LANG_POP - AC_LANG([C++]) LT_INIT([win32-dll]) diff -ruNp libtool-2.2/tests/cdemo/configure libtool-2.2.2/tests/cdemo/configure --- libtool-2.2/tests/cdemo/configure 2008-03-01 19:12:45.000000000 -0500 +++ libtool-2.2.2/tests/cdemo/configure 2008-04-01 20:19:11.000000000 -0400 @@ -3508,8 +3508,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -4083,7 +4083,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -4262,13 +4261,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4265: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4264: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4268: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4267: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4271: output\"" >&5) + (eval echo "\"\$as_me:4270: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4423,7 +4422,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5378,7 +5376,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5381 "configure"' > conftest.$ac_ext + echo '#line 5379 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5782,14 +5780,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -6920,11 +6924,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6923: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6927: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6927: \$? = $ac_status" >&5 + echo "$as_me:6931: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6974,12 +6978,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -7238,11 +7248,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7241: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7251: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7245: \$? = $ac_status" >&5 + echo "$as_me:7255: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7343,11 +7353,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7346: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7356: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7350: \$? = $ac_status" >&5 + echo "$as_me:7360: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7398,11 +7408,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7401: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7411: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7405: \$? = $ac_status" >&5 + echo "$as_me:7415: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7564,19 +7574,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -8035,13 +8044,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -8875,13 +8889,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -10137,7 +10156,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10140 "configure" +#line 10159 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10237,7 +10256,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10240 "configure" +#line 10259 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12189,7 +12208,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/convenience.at libtool-2.2.2/tests/convenience.at --- libtool-2.2/tests/convenience.at 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/tests/convenience.at 2008-04-01 14:06:09.000000000 -0400 @@ -1,6 +1,6 @@ # convenience.at -- testing C convenience archives -*- Autotest -*- -# Copyright (C) 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. # Written by Ralf Wildenhues, 2005 # # This file is part of GNU Libtool. @@ -258,6 +258,16 @@ public class A$i { public A$i () { a = 0; } }; EOF + + # There are just too many broken gcj installations out there, either missing + # libgcj.spec or unable to find it. Skip this test for them. + if test $i -eq 1; then + AT_CHECK([$GCJ $GCJFLAGS -c foo1.java || exit 77], [], [ignore], [ignore]) + AT_CHECK([$GCJ $GCJFLAGS --main=foo1 -o foo1 foo1.java A1.java || exit 77],[],[ignore],[ignore]) + AT_CHECK([./foo1$EXEEXT || exit 77],[],[ignore],[ignore]) + rm -f foo1.o foo1.obj foo1$EXEEXT + fi + $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c foo$i.java $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c A$i.java $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba$i.la A$i.lo diff -ruNp libtool-2.2/tests/defs.in libtool-2.2.2/tests/defs.in --- libtool-2.2/tests/defs.in 2008-02-01 10:51:56.000000000 -0500 +++ libtool-2.2.2/tests/defs.in 2008-04-01 15:00:26.000000000 -0400 @@ -1,7 +1,8 @@ # @configure_input@ # defs -- Defines for Libtool testing environment. # -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software +# Foundation, Inc. # Written by Gord Matzigkeit, 1996 # Rewritten by Gary V. Vaughan, 2003 # @@ -507,6 +508,32 @@ func_show_eval () } +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} + + @@ -575,12 +602,26 @@ func_get_config () my_regex="$4" my_exitp=false - for my_varname in $my_varname_list; do - test -z "$4" && my_regex="^${my_varname}=" + if test -z "$my_regex"; then + my_regex="^(" + my_build_regex=: + else + my_build_regex=false + fi + my_first=: + for my_varname in $my_varname_list; do + if $my_build_regex; then + $my_first || my_regex="$my_regex|" + my_first=false + my_regex="$my_regex$my_varname" + fi eval $my_varname=NONE - eval `eval $my_src | eval $GREP \"$my_regex\"` + done + $my_build_regex && my_regex="$my_regex)=" + eval `eval "$my_src" | eval "$EGREP \"$my_regex\""` + for my_varname in $my_varname_list; do if eval test x\"\$$my_varname\" = xNONE; then func_error "$my_varname not set in \`$my_src'" $my_failp && my_exitp=: @@ -591,20 +632,15 @@ func_get_config () } -# Extract objext from the libtool configuration -func_get_config "objext" "$LIBTOOL --config" ": fatal" - -# Extract objdir from the libtool configuration -func_get_config "objdir" "$LIBTOOL --config" ": fatal" - -# Extract CC from the libtool configuration -func_get_config "CC" "$LIBTOOL --config" ": fatal" - -# Extract host from the libtool configuration -func_get_config "host" "$LIBTOOL --config" ": fatal" +# Extract some variables from the libtool configuration. +func_get_config "objext +objdir +CC +host +host_alias +build +build_alias" "$LIBTOOL --config" ": fatal" -# Extract build from the libtool configuration -func_get_config "build" "$LIBTOOL --config" ": fatal" # func_mkprefixdir func_mkprefixdir () @@ -664,7 +700,8 @@ func_configure_nofail () test -n "$my_args" && my_args=" $my_args" my_args="--srcdir="\""$my_testdir"\"" --prefix="\""$prefix"\""$my_args" - test "$build" != "$host" && my_args="$my_args --host=\"$host\"" + test -n "$host_alias" && my_args="$my_args --host=\"$host_alias\"" + test -n "$build_alias" && my_args="$my_args --build=\"$build_alias\"" func_msg "Configuring in $my_dir" diff -ruNp libtool-2.2/tests/defs.m4sh libtool-2.2.2/tests/defs.m4sh --- libtool-2.2/tests/defs.m4sh 2008-01-08 05:52:35.000000000 -0500 +++ libtool-2.2.2/tests/defs.m4sh 2008-04-01 14:06:09.000000000 -0400 @@ -2,7 +2,8 @@ m4_define([_m4_divert(SCRIPT)], 100) m4_divert_push([SCRIPT])# @configure_input@ # defs -- Defines for Libtool testing environment. # -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software +# Foundation, Inc. # Written by Gord Matzigkeit, 1996 # Rewritten by Gary V. Vaughan, 2003 # @@ -96,12 +97,26 @@ func_get_config () my_regex="$4" my_exitp=false + if test -z "$my_regex"; then + my_regex="^(" + my_build_regex=: + else + my_build_regex=false + fi + my_first=: + for my_varname in $my_varname_list; do - test -z "$4" && my_regex="^${my_varname}=" - + if $my_build_regex; then + $my_first || my_regex="$my_regex|" + my_first=false + my_regex="$my_regex$my_varname" + fi eval $my_varname=NONE - eval `eval $my_src | eval $GREP \"$my_regex\"` + done + $my_build_regex && my_regex="$my_regex)=" + eval `eval "$my_src" | eval "$EGREP \"$my_regex\""` + for my_varname in $my_varname_list; do if eval test x\"\$$my_varname\" = xNONE; then func_error "$my_varname not set in \`$my_src'" $my_failp && my_exitp=: @@ -112,20 +127,15 @@ func_get_config () } -# Extract objext from the libtool configuration -func_get_config "objext" "$LIBTOOL --config" ": fatal" - -# Extract objdir from the libtool configuration -func_get_config "objdir" "$LIBTOOL --config" ": fatal" - -# Extract CC from the libtool configuration -func_get_config "CC" "$LIBTOOL --config" ": fatal" - -# Extract host from the libtool configuration -func_get_config "host" "$LIBTOOL --config" ": fatal" +# Extract some variables from the libtool configuration. +func_get_config "objext +objdir +CC +host +host_alias +build +build_alias" "$LIBTOOL --config" ": fatal" -# Extract build from the libtool configuration -func_get_config "build" "$LIBTOOL --config" ": fatal" # func_mkprefixdir func_mkprefixdir () @@ -185,7 +195,8 @@ func_configure_nofail () test -n "$my_args" && my_args=" $my_args" my_args="--srcdir="\""$my_testdir"\"" --prefix="\""$prefix"\""$my_args" - test "$build" != "$host" && my_args="$my_args --host=\"$host\"" + test -n "$host_alias" && my_args="$my_args --host=\"$host_alias\"" + test -n "$build_alias" && my_args="$my_args --build=\"$build_alias\"" func_msg "Configuring in $my_dir" diff -ruNp libtool-2.2/tests/demo/configure libtool-2.2.2/tests/demo/configure --- libtool-2.2/tests/demo/configure 2008-03-01 19:17:12.000000000 -0500 +++ libtool-2.2.2/tests/demo/configure 2008-04-01 20:19:22.000000000 -0400 @@ -3514,8 +3514,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -4089,7 +4089,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -4268,13 +4267,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4271: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4270: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4274: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4273: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4277: output\"" >&5) + (eval echo "\"\$as_me:4276: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4429,7 +4428,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5384,7 +5382,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5387 "configure"' > conftest.$ac_ext + echo '#line 5385 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5788,14 +5786,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -7235,11 +7239,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7238: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7242: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7242: \$? = $ac_status" >&5 + echo "$as_me:7246: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7289,12 +7293,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -7553,11 +7563,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7556: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7566: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7560: \$? = $ac_status" >&5 + echo "$as_me:7570: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7658,11 +7668,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7661: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7671: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7665: \$? = $ac_status" >&5 + echo "$as_me:7675: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7713,11 +7723,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7716: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7726: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7720: \$? = $ac_status" >&5 + echo "$as_me:7730: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7879,19 +7889,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -8350,13 +8359,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -9190,13 +9204,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -10452,7 +10471,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10455 "configure" +#line 10474 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10552,7 +10571,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10555 "configure" +#line 10574 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12536,7 +12555,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/depdemo/configure libtool-2.2.2/tests/depdemo/configure --- libtool-2.2/tests/depdemo/configure 2008-03-01 19:17:28.000000000 -0500 +++ libtool-2.2.2/tests/depdemo/configure 2008-04-01 20:19:33.000000000 -0400 @@ -3511,8 +3511,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -4086,7 +4086,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -4265,13 +4264,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4268: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4267: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4271: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4270: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4274: output\"" >&5) + (eval echo "\"\$as_me:4273: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4426,7 +4425,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5381,7 +5379,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5384 "configure"' > conftest.$ac_ext + echo '#line 5382 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5785,14 +5783,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -7233,11 +7237,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7236: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7240: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7240: \$? = $ac_status" >&5 + echo "$as_me:7244: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7287,12 +7291,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -7551,11 +7561,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7554: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7564: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7558: \$? = $ac_status" >&5 + echo "$as_me:7568: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7656,11 +7666,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7659: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7669: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7663: \$? = $ac_status" >&5 + echo "$as_me:7673: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7711,11 +7721,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7714: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7724: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7718: \$? = $ac_status" >&5 + echo "$as_me:7728: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7877,19 +7887,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -8348,13 +8357,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -9188,13 +9202,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -10450,7 +10469,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10453 "configure" +#line 10472 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10550,7 +10569,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10553 "configure" +#line 10572 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12518,7 +12537,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/execute-mode.at libtool-2.2.2/tests/execute-mode.at --- libtool-2.2/tests/execute-mode.at 1969-12-31 19:00:00.000000000 -0500 +++ libtool-2.2.2/tests/execute-mode.at 2008-03-05 15:14:43.000000000 -0500 @@ -0,0 +1,122 @@ +# execute-mode.at -- libtool --mode=execute -*- Autotest -*- +# +# Copyright (C) 2008 Free Software Foundation, Inc. +# Written by Ralf Wildenhues, 2008 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +#### + +AT_SETUP([execute mode]) +AT_KEYWORDS([libtool]) + +AT_DATA([foo], +[[#! /bin/sh +if test $# -gt 0; then + echo "$@" +else + : +fi +]]) + +AT_DATA([lt-wrapper], +[[#! /bin/sh +# Generated by GNU libtool. +# fake wrapper script. +program=lt-real +progdir=. +if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + exec "$progdir/$program" ${1+"$@"} + echo "$0: cannot exec $program $*" >&2 + exit 1 +fi +]]) + +AT_DATA([lt-real], +[[#! /bin/sh +echo "$@" +cat +]]) + +AT_DATA([libfakelib.la], +[[# libfakelib.la - a libtool library file +# Generated by ltmain.sh (GNU libtool 1.2605 2008/03/04 22:31:32) 2.3a +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +dlname='' +library_names='' +old_library='libfakelib.a' +inherited_linker_flags='' +dependency_libs='' +weak_library_names='' +current= +age= +revision= +installed=no +shouldnotlink=yes +dlopen='' +dlpreopen='' +libdir='' +]]) + +mkdir sub +cp foo sub/foo +chmod +x foo sub/foo lt-wrapper lt-real + +AT_CHECK([$LIBTOOL --mode=execute ./foo]) +AT_CHECK([$LIBTOOL --mode=execute sub/foo]) +AT_CHECK([$LIBTOOL --mode=execute ./foo foo], [], [foo +]) +AT_CHECK([$LIBTOOL --mode=execute ./lt-wrapper foo &5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -5370,13 +5369,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5373: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5372: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5376: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5375: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5379: output\"" >&5) + (eval echo "\"\$as_me:5378: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5531,7 +5530,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -6485,7 +6483,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6488 "configure"' > conftest.$ac_ext + echo '#line 6486 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6897,14 +6895,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -8318,11 +8322,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8321: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8325: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8325: \$? = $ac_status" >&5 + echo "$as_me:8329: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8372,12 +8376,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -8636,11 +8646,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8639: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8649: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8643: \$? = $ac_status" >&5 + echo "$as_me:8653: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8741,11 +8751,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8744: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8754: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8748: \$? = $ac_status" >&5 + echo "$as_me:8758: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8796,11 +8806,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8799: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8809: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8803: \$? = $ac_status" >&5 + echo "$as_me:8813: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8962,19 +8972,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -9449,13 +9458,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -10289,13 +10303,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -11615,7 +11634,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11618 "configure" +#line 11637 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11715,7 +11734,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11718 "configure" +#line 11737 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12092,12 +12111,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_F77='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -12353,11 +12378,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12356: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12381: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12360: \$? = $ac_status" >&5 + echo "$as_me:12385: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12452,11 +12477,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12455: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12480: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12459: \$? = $ac_status" >&5 + echo "$as_me:12484: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12504,11 +12529,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12507: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12532: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12511: \$? = $ac_status" >&5 + echo "$as_me:12536: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12667,19 +12692,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_F77=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='' + ;; + m68k) + archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + ;; + esac ;; beos*) @@ -13118,13 +13142,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs_F77=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='' + ;; + m68k) + archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + ;; + esac ;; bsdi[45]*) @@ -13805,13 +13834,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -16165,7 +16199,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/fcdemo/configure libtool-2.2.2/tests/fcdemo/configure --- libtool-2.2/tests/fcdemo/configure 2008-03-01 19:18:01.000000000 -0500 +++ libtool-2.2.2/tests/fcdemo/configure 2008-04-01 20:20:01.000000000 -0400 @@ -4767,8 +4767,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -5342,7 +5342,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -5521,13 +5520,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5524: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5523: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5527: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5526: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5530: output\"" >&5) + (eval echo "\"\$as_me:5529: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5682,7 +5681,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -6636,7 +6634,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6639 "configure"' > conftest.$ac_ext + echo '#line 6637 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7048,14 +7046,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -8468,11 +8472,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8471: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8475: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8475: \$? = $ac_status" >&5 + echo "$as_me:8479: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8522,12 +8526,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -8786,11 +8796,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8789: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8799: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8793: \$? = $ac_status" >&5 + echo "$as_me:8803: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8891,11 +8901,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8894: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8904: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8898: \$? = $ac_status" >&5 + echo "$as_me:8908: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8946,11 +8956,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8949: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8959: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8953: \$? = $ac_status" >&5 + echo "$as_me:8963: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9112,19 +9122,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -9599,13 +9608,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -10439,13 +10453,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -11765,7 +11784,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11768 "configure" +#line 11787 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11865,7 +11884,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11868 "configure" +#line 11887 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12389,12 +12408,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_FC='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -12650,11 +12675,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12653: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12678: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12657: \$? = $ac_status" >&5 + echo "$as_me:12682: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12749,11 +12774,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12752: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12777: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12756: \$? = $ac_status" >&5 + echo "$as_me:12781: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12801,11 +12826,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12804: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12829: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12808: \$? = $ac_status" >&5 + echo "$as_me:12833: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12964,19 +12989,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_FC='-L$libdir' - hardcode_minus_L_FC=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_FC=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_FC='' + ;; + m68k) + archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_FC='-L$libdir' + hardcode_minus_L_FC=yes + ;; + esac ;; beos*) @@ -13415,13 +13439,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_FC='-L$libdir' - hardcode_minus_L_FC=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs_FC=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_FC='' + ;; + m68k) + archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_FC='-L$libdir' + hardcode_minus_L_FC=yes + ;; + esac ;; bsdi[45]*) @@ -14102,13 +14131,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -16485,7 +16519,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/localization.at libtool-2.2.2/tests/localization.at --- libtool-2.2/tests/localization.at 1969-12-31 19:00:00.000000000 -0500 +++ libtool-2.2.2/tests/localization.at 2008-03-16 04:34:25.000000000 -0400 @@ -0,0 +1,57 @@ +# localization.at -- libtool and locales -*- Autotest -*- +# +# Copyright (C) 2008 Free Software Foundation, Inc. +# Written by Ralf Wildenhues, 2008 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +#### + +AT_SETUP([localized compiler messages]) +AT_KEYWORDS([libtool]) + +# Let's try German locale. :-) +LANG=de_DE +LANGUAGE=de_DE +LC_ALL=de_DE +export LANG LANGUAGE LC_ALL + +AT_DATA([a.c], +[[int x[-1]; +]]) +AT_DATA([b.c], +[[int y; +]]) + +AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c || exit 1], [1], [stdout], [stderr]) +mv -f stdout expected-stdout +mv -f stderr expected-stderr +AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || exit 1], + [1], [stdout], [stderr]) +AT_CHECK([diff expected-stderr stderr]) +LTBASE=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'` +AT_CHECK([grep -v "^$LTBASE: compile" stdout | diff expected-stdout -]) + +# check that we get our quoting right. +LANGUAGE='a; nosuchprogram " '\'' & $x /#+*(){}|,:`\ !%' +export LANGUAGE +AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c b.c], + [0], [stdout], [stderr]) +AT_CHECK([grep nosuchprogram stdout stderr], [1]) + +AT_CLEANUP diff -ruNp libtool-2.2/tests/lt_dladvise.at libtool-2.2.2/tests/lt_dladvise.at --- libtool-2.2/tests/lt_dladvise.at 2008-03-01 16:33:13.000000000 -0500 +++ libtool-2.2.2/tests/lt_dladvise.at 2008-04-01 14:06:09.000000000 -0400 @@ -173,8 +173,9 @@ hint_global (void) printf ("global: %d\n", moduletest (handle, "f", "i")); /* Don't attempt to load moddepend unless modglobal was successfully - loaded and the symglobal hint was taken. */ - if (info && info->is_symglobal) + loaded and the symglobal hint was taken, and the system allows to + to have undefined symbols. */ + if (info && info->is_symglobal && HAVE_UNDEFINED_SYMBOLS) { hint_ext (); } @@ -285,10 +286,12 @@ dlopenable='resident local global' # ------------------------------------------------------------------------- # case $host_os in -cygwin*) +cygwin* | mingw*) # These hosts do not support linking without -no-undefined + CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=0" ;; *) + CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=1" dlopenable="$dlopen depend" $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c moddepend.c AT_CHECK([$LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o libdepend.la \ @@ -317,8 +320,8 @@ for dlopen in -dlopen; do modules="${modules+$modules }$dlopen lib$module.la" done - AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \ - $modules $LIBLTDL], [], [ignore], [ignore]) + AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT $modules $LIBLTDL], + [], [ignore], [ignore]) LT_AT_NOINST_EXEC_CHECK([./main], [$modules], [], [expout], []) done diff -ruNp libtool-2.2/tests/lt_dlexit.at libtool-2.2.2/tests/lt_dlexit.at --- libtool-2.2/tests/lt_dlexit.at 2008-03-01 16:33:13.000000000 -0500 +++ libtool-2.2.2/tests/lt_dlexit.at 2008-03-06 22:06:59.000000000 -0500 @@ -32,6 +32,7 @@ AT_KEYWORDS([libltdl]) # Test for # http://lists.gnu.org/archive/html/bug-libtool/2007-01/msg00014.html +# http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00013.html AT_DATA([main.c], [[#include @@ -80,6 +81,14 @@ main (void) fprintf (stderr, "error during initialization: %s\n", lt_dlerror()); return 1; } + if (lt_dlexit() != 0) { + fprintf (stderr, "error during first lt_dlexit: %s\n", lt_dlerror()); + return 1; + } + if (lt_dlinit() != 0) { + fprintf (stderr, "error during second initialization: %s\n", lt_dlerror()); + return 1; + } if (!(b1 = xdlopen ("modb1.la"))) return 1; if (xdlsymtest (b1, "fb1", "vb1")) return 1; /* do not lt_dlclose here on purpose. */ diff -ruNp libtool-2.2/tests/mdemo/configure libtool-2.2.2/tests/mdemo/configure --- libtool-2.2/tests/mdemo/configure 2008-03-01 19:18:17.000000000 -0500 +++ libtool-2.2.2/tests/mdemo/configure 2008-04-01 20:20:15.000000000 -0400 @@ -3546,8 +3546,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -4121,7 +4121,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -4300,13 +4299,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4303: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4302: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4306: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4305: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4309: output\"" >&5) + (eval echo "\"\$as_me:4308: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4461,7 +4460,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5416,7 +5414,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5419 "configure"' > conftest.$ac_ext + echo '#line 5417 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5820,14 +5818,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -7267,11 +7271,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7270: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7274: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7274: \$? = $ac_status" >&5 + echo "$as_me:7278: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7321,12 +7325,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -7585,11 +7595,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7588: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7598: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7592: \$? = $ac_status" >&5 + echo "$as_me:7602: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7690,11 +7700,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7693: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7703: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7697: \$? = $ac_status" >&5 + echo "$as_me:7707: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7745,11 +7755,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7748: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7758: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7752: \$? = $ac_status" >&5 + echo "$as_me:7762: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7911,19 +7921,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -8382,13 +8391,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -9222,13 +9236,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -10484,7 +10503,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10487 "configure" +#line 10506 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10584,7 +10603,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10587 "configure" +#line 10606 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12551,7 +12570,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/mdemo2/configure libtool-2.2.2/tests/mdemo2/configure --- libtool-2.2/tests/mdemo2/configure 2008-03-01 19:18:32.000000000 -0500 +++ libtool-2.2.2/tests/mdemo2/configure 2008-04-01 20:20:26.000000000 -0400 @@ -3508,8 +3508,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -4083,7 +4083,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -4262,13 +4261,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4265: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4264: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4268: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4267: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4271: output\"" >&5) + (eval echo "\"\$as_me:4270: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4423,7 +4422,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5378,7 +5376,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5381 "configure"' > conftest.$ac_ext + echo '#line 5379 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5782,14 +5780,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -6919,11 +6923,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6922: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6926: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6926: \$? = $ac_status" >&5 + echo "$as_me:6930: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6973,12 +6977,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -7237,11 +7247,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7240: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7250: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7244: \$? = $ac_status" >&5 + echo "$as_me:7254: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7342,11 +7352,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7345: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7355: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7349: \$? = $ac_status" >&5 + echo "$as_me:7359: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7397,11 +7407,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7400: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7410: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7404: \$? = $ac_status" >&5 + echo "$as_me:7414: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7563,19 +7573,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -8034,13 +8043,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -8874,13 +8888,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -10136,7 +10155,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10139 "configure" +#line 10158 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10236,7 +10255,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10239 "configure" +#line 10258 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11980,7 +11999,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/nonrecursive.at libtool-2.2.2/tests/nonrecursive.at --- libtool-2.2/tests/nonrecursive.at 2008-01-08 05:52:35.000000000 -0500 +++ libtool-2.2.2/tests/nonrecursive.at 2008-04-01 14:06:09.000000000 -0400 @@ -64,7 +64,7 @@ MOSTLYCLEANFILES = include ltdl/Makefile.inc -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined foo_la_SOURCES = foo.c ]]) diff -ruNp libtool-2.2/tests/package.m4 libtool-2.2.2/tests/package.m4 --- libtool-2.2/tests/package.m4 2008-03-01 18:02:30.000000000 -0500 +++ libtool-2.2.2/tests/package.m4 2008-04-01 15:00:23.000000000 -0400 @@ -1,6 +1,6 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [libtool]) m4_define([AT_PACKAGE_TARNAME], [libtool]) -m4_define([AT_PACKAGE_VERSION], [2.2]) -m4_define([AT_PACKAGE_STRING], [libtool 2.2]) +m4_define([AT_PACKAGE_VERSION], [2.2.2]) +m4_define([AT_PACKAGE_STRING], [libtool 2.2.2]) m4_define([AT_PACKAGE_BUGREPORT], [bug-libtool@gnu.org]) diff -ruNp libtool-2.2/tests/pdemo/configure libtool-2.2.2/tests/pdemo/configure --- libtool-2.2/tests/pdemo/configure 2008-03-01 19:18:46.000000000 -0500 +++ libtool-2.2.2/tests/pdemo/configure 2008-04-01 20:20:37.000000000 -0400 @@ -3511,8 +3511,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -4086,7 +4086,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -4265,13 +4264,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4268: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4267: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4271: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4270: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4274: output\"" >&5) + (eval echo "\"\$as_me:4273: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4426,7 +4425,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -5381,7 +5379,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5384 "configure"' > conftest.$ac_ext + echo '#line 5382 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5785,14 +5783,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -6922,11 +6926,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6925: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6929: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6929: \$? = $ac_status" >&5 + echo "$as_me:6933: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6976,12 +6980,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -7240,11 +7250,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7243: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7253: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7247: \$? = $ac_status" >&5 + echo "$as_me:7257: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7345,11 +7355,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7348: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7358: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7352: \$? = $ac_status" >&5 + echo "$as_me:7362: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7400,11 +7410,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7403: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7413: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7407: \$? = $ac_status" >&5 + echo "$as_me:7417: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7566,19 +7576,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -8037,13 +8046,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -8877,13 +8891,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -10139,7 +10158,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10142 "configure" +#line 10161 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10239,7 +10258,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10242 "configure" +#line 10261 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12217,7 +12236,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/quote.test libtool-2.2.2/tests/quote.test --- libtool-2.2/tests/quote.test 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/tests/quote.test 2008-04-01 14:06:09.000000000 -0400 @@ -1,7 +1,7 @@ #! /bin/sh # quote.test - make sure that shell metacharacters do not blow up libtool # -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2003 # # This file is part of GNU Libtool. @@ -37,8 +37,7 @@ case $1 in ;; esac -func_get_config "ECHO" "$LIBTOOL --config" -func_get_config "wl" "$LIBTOOL --config" +func_get_config "ECHO wl" "$LIBTOOL --config" for mode in compile link install; do $ECHO "== $mode mode" diff -ruNp libtool-2.2/tests/recursive.at libtool-2.2.2/tests/recursive.at --- libtool-2.2/tests/recursive.at 2008-01-08 05:52:35.000000000 -0500 +++ libtool-2.2.2/tests/recursive.at 2008-04-01 14:06:09.000000000 -0400 @@ -46,7 +46,7 @@ AT_DATA([Makefile.am], AUTOMAKE_OPTIONS = 1.7 SUBDIRS = ltdl lib_LTLIBRARIES = foo.la -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined foo_la_SOURCES = foo.c ]]) diff -ruNp libtool-2.2/tests/static.at libtool-2.2.2/tests/static.at --- libtool-2.2/tests/static.at 2007-09-20 16:17:55.000000000 -0400 +++ libtool-2.2.2/tests/static.at 2008-04-01 14:06:09.000000000 -0400 @@ -1,6 +1,6 @@ # static.at -- test flags for static/dynamic linking -*- Autotest -*- # -# Copyright (C) 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Ralf Wildenhues, 2006 # # This file is part of GNU Libtool. @@ -92,6 +92,16 @@ eval `$LIBTOOL --config | if test -n "$per_deplib_static_flag" && test -n "$per_deplib_dynamic_flag"; then per_deplib=: fi +# On GNU/Linux with --disable-static, m-all-static fails to link. +# What we'd like to state here is: if the user actively passed +# --disable-static (as opposed to: the libtool.m4 macros set +# enable_static=no), then they cannot expect -all-static to work. +# So we punt, knowing that we mangle enable_static on AIX only. +can_link_all_static=-all-static +case $host_os,$have_static,$link_static_flag in + aix*) ;; + *,false,?*) can_link_all_static= ;; +esac # Create broken libraries. They will later be moved to those # directories where the respective libraries should be linked @@ -248,10 +258,10 @@ for withdep in no yes; do $CC $CPPFLAGS $CFLAGS -c m.c # global static flags. - for st in -static -static-libtool-libs -all-static; do + for st in -static -static-libtool-libs $can_link_all_static; do AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m$st m.$OBJEXT \ - -L$libdir1 -la1 a2/liba2.la -L$libdir3 -R$libdir3 -la3], - [0], [ignore], [ignore]) + -L$libdir1 -la1 a2/liba2.la -L$libdir3 -R$libdir3 -la3], + [0], [ignore], [ignore]) done # per-deplib static/shared flags. @@ -296,7 +306,7 @@ for withdep in no yes; do ### install the programs. # We can't install any program that links dynamically against liba2. - for st in -static -static-libtool-libs -all-static `$per_deplib && echo 2 12 23 123 123a`; do + for st in -static -static-libtool-libs $can_link_all_static `$per_deplib && echo 2 12 23 123 123a`; do echo "# m$st" AT_CHECK([$LIBTOOL --mode=install cp m$st $bindir/m$st], [0], [ignore], [stderr]) if $have_static; then diff -ruNp libtool-2.2/tests/subproject.at libtool-2.2.2/tests/subproject.at --- libtool-2.2/tests/subproject.at 2008-01-17 11:45:28.000000000 -0500 +++ libtool-2.2.2/tests/subproject.at 2008-04-01 14:06:09.000000000 -0400 @@ -1,6 +1,6 @@ # subproject.at -- test subproject Libltdl builds -*- Autotest -*- # -# Copyright (C) 2005 Free Software Foundation, Inc. +# Copyright (C) 2005, 2008 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2005 # # This file is part of GNU Libtool. @@ -44,7 +44,7 @@ AT_DATA([Makefile.am], AUTOMAKE_OPTIONS = 1.9 SUBDIRS = sub/ltdl lib_LTLIBRARIES = foo.la -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined ]]) echo 'int dummy = 0;' > foo.c diff -ruNp libtool-2.2/tests/tagdemo/configure libtool-2.2.2/tests/tagdemo/configure --- libtool-2.2/tests/tagdemo/configure 2008-03-01 19:19:02.000000000 -0500 +++ libtool-2.2.2/tests/tagdemo/configure 2008-04-01 20:20:51.000000000 -0400 @@ -4821,8 +4821,8 @@ esac -macro_version='2.2' -macro_revision='1.2599' +macro_version='2.2.2' +macro_revision='1.2627' @@ -5313,7 +5313,6 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then @@ -5492,13 +5491,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5495: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5494: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5498: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5497: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5501: output\"" >&5) + (eval echo "\"\$as_me:5500: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5653,7 +5652,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${CP="cp -f"} : ${MV="mv -f"} : ${RM="rm -f"} @@ -6608,7 +6606,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6611 "configure"' > conftest.$ac_ext + echo '#line 6609 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7012,14 +7010,20 @@ else # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the # link flags. + rm -rf libconftest.dylib* echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* + else + cat conftest.err >&5 fi - rm conftest.c + rm -rf libconftest.dylib* + rm -f conftest.* fi fi { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 @@ -8624,11 +8628,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8627: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8631: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8631: \$? = $ac_status" >&5 + echo "$as_me:8635: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8678,12 +8682,18 @@ echo $ECHO_N "checking for $compiler opt ;; amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) @@ -8942,11 +8952,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8945: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8955: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8949: \$? = $ac_status" >&5 + echo "$as_me:8959: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9047,11 +9057,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9050: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9060: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9054: \$? = $ac_status" >&5 + echo "$as_me:9064: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9102,11 +9112,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9105: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9115: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9109: \$? = $ac_status" >&5 + echo "$as_me:9119: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9268,19 +9278,18 @@ _LT_EOF ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) @@ -9739,13 +9748,18 @@ if test -z "$aix_libpath"; then aix_libp ;; amigaos*) - if test "$host_cpu" = m68k; then - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - fi - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) @@ -10579,13 +10593,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -11841,7 +11860,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11844 "configure" +#line 11863 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11941,7 +11960,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11944 "configure" +#line 11963 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13624,14 +13643,22 @@ echo $ECHO_N "checking for $compiler opt lt_prog_compiler_static_CXX='-Bstatic' fi ;; + amigaos*) - if test "$host_cpu" = m68k; then - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_CXX='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -13936,11 +13963,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13939: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13966: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13943: \$? = $ac_status" >&5 + echo "$as_me:13970: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14035,11 +14062,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14038: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14065: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14042: \$? = $ac_status" >&5 + echo "$as_me:14069: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14087,11 +14114,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14090: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14117: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14094: \$? = $ac_status" >&5 + echo "$as_me:14121: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14384,13 +14411,18 @@ aix[4-9]*) ;; amigaos*) - if test "$host_cpu" = m68k; then + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - else - dynamic_linker=no - fi + ;; + esac ;; beos*) @@ -16902,7 +16934,7 @@ done #! $SHELL # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff -ruNp libtool-2.2/tests/testsuite libtool-2.2.2/tests/testsuite --- libtool-2.2/tests/testsuite 2008-03-01 18:02:33.000000000 -0500 +++ libtool-2.2.2/tests/testsuite 2008-04-01 15:00:26.000000000 -0400 @@ -1,7 +1,8 @@ #! /bin/sh +# Generated from testsuite.at by GNU Autoconf 2.61a.359-49ffd-dirty. # -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software -# Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. # This test suite is free software; the Free Software Foundation gives # unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -13,7 +14,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -35,17 +36,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -61,8 +90,6 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -85,7 +112,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -98,17 +125,10 @@ PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -130,7 +150,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -156,7 +176,7 @@ else as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -238,7 +258,7 @@ IFS=$as_save_IFS if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -259,7 +279,7 @@ _ASEOF if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -339,10 +359,10 @@ fi if test "x$CONFIG_SHELL" != x; then for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -411,9 +431,10 @@ fi test \$exitcode = 0") || { echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. } @@ -449,7 +470,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -477,7 +498,6 @@ case `echo -n x` in *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -490,19 +510,22 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -527,10 +550,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -547,32 +570,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr + + SHELL=${CONFIG_SHELL-/bin/sh} # How were we run? at_cli_args="$@" -# Load the config file. -for at_file in atconfig atlocal -do - test -r $at_file || continue - . ./$at_file || { echo "$as_me: error: invalid content: $at_file" >&2 - { (exit 1); exit 1; }; } -done - -# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix: -: ${at_top_build_prefix=$at_top_builddir} - -# atconfig delivers names relative to the directory the test suite is -# in, but the groups themselves are run in testsuite-dir/group-dir. -if test -n "$at_top_srcdir"; then - builddir=../.. - for at_dir in srcdir top_srcdir top_build_prefix - do - at_val=`eval echo '${'at_$at_dir'}'` - eval "$at_dir=\$at_val/../.." - done -fi # Not all shells have the 'times' builtin; the subshell is needed to make # sure we discard the 'times: not found' message from the shell. @@ -583,9 +587,9 @@ at_times_p=false at_debug_args= # -e sets to true at_errexit_p=false -# Shall we be verbose? +# Shall we be verbose? ':' means no, empty means yes. at_verbose=: -at_quiet=echo +at_quiet= # Shall we keep the debug scripts? Must be `:' when the suite is # run by a debug script, so that the script doesn't remove itself. @@ -596,31 +600,27 @@ at_help_p=false at_version_p=false # List test groups? at_list_p=false +# --clean +at_clean=false # Test groups to run at_groups= +# Whether a write failure occurred +at_write_fail=0 -# The directory we are in. +# The directory we run the suite in. Default to . if no -C option. at_dir=`pwd` -# The directory the whole suite works in. -# Should be absolutely to let the user `cd' at will. -at_suite_dir=$at_dir/$as_me.dir -# The file containing the suite. -at_suite_log=$at_dir/$as_me.log -# The file containing the location of the last AT_CHECK. -at_check_line_file=$at_suite_dir/at-check-line -# The file containing the exit status of the last command. -at_status_file=$at_suite_dir/at-status -# The files containing the output of the tested commands. -at_stdout=$at_suite_dir/at-stdout -at_stder1=$at_suite_dir/at-stder1 -at_stderr=$at_suite_dir/at-stderr -# The file containing dates. -at_times_file=$at_suite_dir/at-times +# An absolute reference to this testsuite script. +case $as_myself in + [\\/]* | ?:[\\/]* ) at_myself=$as_myself ;; + * ) at_myself=$at_dir/$as_myself ;; +esac +# Whether -C is in effect. +at_change_dir=false # List of the tested programs. at_tested='' # List of the all the test groups. -at_groups_all=' banner-1 1 2 3 4 5 6 7 8 9 10 banner-2 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 banner-3 31 32 banner-4 33 34 banner-5 35 36 banner-6 37 38 39 banner-7 40 41 42 43 banner-8 44 45 46 47 banner-9 48 49 50 banner-10 51 52 53 banner-11 54 55 banner-12 56 banner-13 57 58 banner-14 59 banner-15 60 61 62 banner-16 63 64' +at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66' # As many question marks as there are digits in the last test group number. # Used to normalize the test group numbers so that `ls' lists them in # numerical order. @@ -641,10 +641,10 @@ at_help_all="1;libtoolize.at:79;libtooli 13;duplicate_deps.at:25;preserve duplicate convenience deps;libtool; 14;inherited_flags.at:26;inherited_linker_flags;libtool; 15;convenience.at:30;C convenience archives;libtool; -16;convenience.at:69;C++ convenience archives;CXX libtool; -17;convenience.at:109;F77 convenience archives;F77 libtool; -18;convenience.at:169;FC convenience archives;FC libtool; -19;convenience.at:229;Java convenience archives;GCJ libtool; +16;convenience.at:69;C++ convenience archives;cxx libtool; +17;convenience.at:109;F77 convenience archives;f77 libtool; +18;convenience.at:169;FC convenience archives;fc libtool; +19;convenience.at:229;Java convenience archives;gcj libtool; 20;link-order.at:26;Link order test.;libtool; 21;link-order2.at:46;Link order of deplibs.;libtool; 22;fail.at:27;Failure tests;libtool; @@ -656,42 +656,58 @@ at_help_all="1;libtoolize.at:79;libtooli 28;indirect_deps.at:25;indirect convenience;libtool; 29;indirect_deps.at:71;indirect uninstalled;libtool; 30;archive-in-archive.at:26;static library contains static library;libtool; -31;destdir.at:48;Simple DESTDIR install;libtool; -32;destdir.at:75;DESTDIR with in-package deplibs;libtool; -33;old-m4-iface.at:40;AM_PROG_LIBTOOL;libtoolize autoconf; -34;old-m4-iface.at:107;AC_WITH_LTDL;libtoolize automake autoconf; -35;am-subdir.at:33;C subdir-objects;libtoolize automake autoconf; -36;am-subdir.at:93;C++ subdir-objects;CXX libtoolize automake autoconf; -37;lt_dlexit.at:30;lt_dlexit unloading libs;libltdl; -38;lt_dladvise.at:28;lt_dlopenadvise library loading;libltdl; -39;need_lib_prefix.at:25;enforced lib prefix;libltdl libtool; -40;standalone.at:31;compiling softlinked libltdl;libtoolize; -41;standalone.at:46;compiling copied libltdl;libtoolize; -42;standalone.at:61;installable libltdl;libtoolize; -43;standalone.at:79;linking libltdl without autotools;libtoolize; -44;subproject.at:57;compiling softlinked libltdl;libtoolize automake autoconf; -45;subproject.at:73;compiling copied libltdl;libtoolize automake autoconf; -46;subproject.at:89;installable libltdl;libtoolize automake autoconf; -47;subproject.at:109;linking libltdl without autotools;libtoolize; -48;nonrecursive.at:78;compiling softlinked libltdl;libtoolize automake autoconf; -49;nonrecursive.at:102;compiling copied libltdl;libtoolize automake autoconf; -50;nonrecursive.at:126;installable libltdl;libtoolize automake autoconf; -51;recursive.at:60;compiling softlinked libltdl;libtoolize autoconf automake; -52;recursive.at:80;compiling copied libltdl;libtoolize autoconf automake; -53;recursive.at:100;installable libltdl;libtoolize autoconf automake; -54;template.at:27;simple template test;CXX libtool; -55;template.at:126;template test with subdirs;CXX libtool; -56;ctor.at:27;C++ static constructors;CXX libtool; -57;early-libtool.at:32;config.status;libtoolize automake autoconf; -58;early-libtool.at:126;config.lt;libtoolize automake autoconf; -59;deplibs-ident.at:32;build tree relpaths;libtool; -60;configure-iface.at:102;installable libltdl;libltdl libtoolize automake autoconf; -61;configure-iface.at:159;--with-ltdl-include/lib;libltdl libtoolize automake autoconf; -62;configure-iface.at:225;--with-included-ltdl;libltdl libtoolize automake autoconf; -63;stresstest.at:31;Link option thorough search test;libtool; -64;cmdline_wrap.at:28;Run tests with low max_cmd_len;recursive; +31;execute-mode.at:25;execute mode;libtool; +32;localization.at:25;localized compiler messages;libtool; +33;destdir.at:48;Simple DESTDIR install;libtool; +34;destdir.at:75;DESTDIR with in-package deplibs;libtool; +35;old-m4-iface.at:40;AM_PROG_LIBTOOL;libtoolize autoconf; +36;old-m4-iface.at:107;AC_WITH_LTDL;libtoolize automake autoconf; +37;am-subdir.at:33;C subdir-objects;libtoolize automake autoconf; +38;am-subdir.at:93;C++ subdir-objects;cxx libtoolize automake autoconf; +39;lt_dlexit.at:30;lt_dlexit unloading libs;libltdl; +40;lt_dladvise.at:28;lt_dlopenadvise library loading;libltdl; +41;need_lib_prefix.at:25;enforced lib prefix;libltdl libtool; +42;standalone.at:31;compiling softlinked libltdl;libtoolize; +43;standalone.at:46;compiling copied libltdl;libtoolize; +44;standalone.at:61;installable libltdl;libtoolize; +45;standalone.at:79;linking libltdl without autotools;libtoolize; +46;subproject.at:57;compiling softlinked libltdl;libtoolize automake autoconf; +47;subproject.at:73;compiling copied libltdl;libtoolize automake autoconf; +48;subproject.at:89;installable libltdl;libtoolize automake autoconf; +49;subproject.at:109;linking libltdl without autotools;libtoolize; +50;nonrecursive.at:78;compiling softlinked libltdl;libtoolize automake autoconf; +51;nonrecursive.at:102;compiling copied libltdl;libtoolize automake autoconf; +52;nonrecursive.at:126;installable libltdl;libtoolize automake autoconf; +53;recursive.at:60;compiling softlinked libltdl;libtoolize autoconf automake; +54;recursive.at:80;compiling copied libltdl;libtoolize autoconf automake; +55;recursive.at:100;installable libltdl;libtoolize autoconf automake; +56;template.at:27;simple template test;cxx libtool; +57;template.at:126;template test with subdirs;cxx libtool; +58;ctor.at:27;C++ static constructors;cxx libtool; +59;early-libtool.at:32;config.status;libtoolize automake autoconf; +60;early-libtool.at:126;config.lt;libtoolize automake autoconf; +61;deplibs-ident.at:32;build tree relpaths;libtool; +62;configure-iface.at:102;installable libltdl;libltdl libtoolize automake autoconf; +63;configure-iface.at:159;--with-ltdl-include/lib;libltdl libtoolize automake autoconf; +64;configure-iface.at:225;--with-included-ltdl;libltdl libtoolize automake autoconf; +65;stresstest.at:31;Link option thorough search test;libtool; +66;cmdline_wrap.at:28;Run tests with low max_cmd_len;recursive; " +# at_func_validate_ranges [N...] +# ------------------------------ +# validate test group ranges +at_func_validate_ranges () +{ + for at_grp + do + if test $at_grp -lt 1 || test $at_grp -gt 66; then + $as_echo "invalid test group: $at_grp" >&2 + exit 1 + fi + done +} + at_prev= for at_option do @@ -722,10 +738,7 @@ do ;; --clean | -c ) - test -d "$at_suite_dir" && - find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \; - rm -f -r "$at_suite_dir" "$at_suite_log" - exit 0 + at_clean=: ;; --debug | -d ) @@ -738,7 +751,7 @@ do ;; --verbose | -v ) - at_verbose=echo; at_quiet=: + at_verbose=; at_quiet=: ;; --trace | -x ) @@ -746,20 +759,23 @@ do ;; [0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]) + at_func_validate_ranges $at_option at_groups="$at_groups$at_option " ;; # Ranges [0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-) at_range_start=`echo $at_option |tr -d X-` - at_range=`echo " $at_groups_all " | \ + at_func_validate_ranges $at_range_start + at_range=`$as_echo " $at_groups_all " | \ sed -e 's/^.* \('$at_range_start' \)/\1/'` at_groups="$at_groups$at_range " ;; -[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9]) at_range_end=`echo $at_option |tr -d X-` - at_range=`echo " $at_groups_all " | \ + at_func_validate_ranges $at_range_end + at_range=`$as_echo " $at_groups_all " | \ sed -e 's/\( '$at_range_end'\) .*$/\1/'` at_groups="$at_groups$at_range " ;; @@ -777,12 +793,22 @@ do at_range_end=$at_range_start at_range_start=$at_tmp fi - at_range=`echo " $at_groups_all " | \ + at_func_validate_ranges $at_range_start $at_range_end + at_range=`$as_echo " $at_groups_all " | \ sed -e 's/^.*\( '$at_range_start' \)/\1/' \ -e 's/\( '$at_range_end'\) .*$/\1/'` at_groups="$at_groups$at_range " ;; + # Directory selection. + --directory | -C ) + at_prev=--directory + ;; + --directory=* ) + at_change_dir=: + at_dir=$at_optarg + ;; + # Keywords. --keywords | -k ) at_prev=--keywords @@ -804,68 +830,55 @@ do ;; esac # It is on purpose that we match the test group titles too. - at_groups_selected=`echo "$at_groups_selected" | + at_groups_selected=`$as_echo "$at_groups_selected" | grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"` done - at_groups_selected=`echo "$at_groups_selected" | sed 's/;.*//'` # Smash the newlines. - at_groups="$at_groups`echo $at_groups_selected` " + at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' | + tr "$as_nl" ' ' + ` + at_groups="$at_groups$at_groups_selected " ;; *=*) at_envvar=`expr "x$at_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$at_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $at_envvar" >&2 - { (exit 1); exit 1; }; } - at_value=`echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$at_envvar='$at_value'" + case $at_envvar in + '' | [0-9]* | *[!_$as_cr_alnum]* ) + { $as_echo "$as_me: error: invalid variable name: $at_envvar" >&2 + { (exit 1); exit 1; }; } ;; + esac + at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"` + # Export now, but save eval for later and for debug scripts. export $at_envvar - # Propagate to debug scripts. at_debug_args="$at_debug_args $at_envvar='$at_value'" ;; - *) echo "$as_me: invalid option: $at_option" >&2 - echo "Try \`$0 --help' for more information." >&2 + *) $as_echo "$as_me: invalid option: $at_option" >&2 + $as_echo "Try \`$0 --help' for more information." >&2 exit 1 ;; esac done +# Verify our last option didn't require an argument +if test -n "$at_prev"; then + { $as_echo "$as_me: error: \`$at_prev' requires an argument." >&2 + { (exit 1); exit 1; }; } +fi + + # Selected test groups. if test -z "$at_groups"; then at_groups=$at_groups_all else - # Sort the tests, removing duplicates: - at_groups=`echo $at_groups | tr ' ' "$as_nl" | sort -nu` - # and add banners. (Passing at_groups_all is tricky--see the comment - # starting with "Passing at_groups is tricky.") - at_groups=`echo "$at_groups$as_nl $at_groups_all" | - awk 'BEGIN { FS = "@" } # Effectively switch off field splitting. - /^$/ { next } # Ignore the empty line. - !/ / { groups++; selected[$ 0] = 1; next } - # The last line, containing at_groups_all. - { - n = split($ 0, a, " ") - # If there are several tests, select their banners: - if (groups > 1) { - for (i = 1; i <= n; i++) { - if (a[i] ~ /^banner-/) - banner = a[i] - else if (banner != "" && selected[a[i]] == 1) - selected[banner] = 1 - } - } - for (i = 1; i <= n; i++) - if (selected[a[i]] == 1) - list = list " " a[i] - print list - }'` + # Sort the tests, removing duplicates. + at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu` fi # Help message. if $at_help_p; then - cat <<_ATEOF + cat <<_ATEOF || at_write_fail=1 Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS] Run all the tests, or the selected TESTS, given by numeric ranges, and @@ -882,7 +895,7 @@ possibly amounts into PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH _ATEOF -cat <<_ATEOF +cat <<_ATEOF || at_write_fail=1 Operation modes: -h, --help print the help message, then exit @@ -890,30 +903,32 @@ Operation modes: -c, --clean remove all the files this test suite might create and exit -l, --list describes all the tests, or the selected TESTS _ATEOF -cat <<_ATEOF +cat <<_ATEOF || at_write_fail=1 Execution tuning: + -C, --directory=DIR + change to directory DIR before starting -k, --keywords=KEYWORDS - select the tests matching all the comma-separated KEYWORDS - multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD + select the tests matching all the comma-separated KEYWORDS + multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD -e, --errexit abort as soon as a test fails; implies --debug -v, --verbose force more detailed output - default for debugging scripts + default for debugging scripts -d, --debug inhibit clean up and top-level logging - default for debugging scripts + default for debugging scripts -x, --trace enable tests shell tracing _ATEOF -cat <<_ATEOF +cat <<_ATEOF || at_write_fail=1 Report bugs to . _ATEOF - exit 0 + exit $at_write_fail fi # List of tests. if $at_list_p; then - cat <<_ATEOF -libtool 2.2 test suite test groups: + cat <<_ATEOF || at_write_fail=1 +libtool 2.2.2 test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -922,7 +937,12 @@ _ATEOF # Passing at_groups is tricky. We cannot use it to form a literal string # or regexp because of the limitation of AIX awk. And Solaris' awk # doesn't grok more than 99 fields in a record, so we have to use `split'. - echo "$at_groups$as_nl$at_help_all" | + # at_groups needs to be space-separated for this script to work. + case $at_groups in + *"$as_nl"* ) + at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;; + esac + $as_echo "$at_groups$as_nl$at_help_all" | awk 'BEGIN { FS = ";" } NR == 1 { for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1 @@ -933,51 +953,153 @@ _ATEOF printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3 if ($ 4) printf " %s\n", $ 4 } - }' - exit 0 + }' || at_write_fail=1 + exit $at_write_fail fi if $at_version_p; then - echo "$as_me (libtool 2.2)" - cat <<\_ACEOF + $as_echo "$as_me (libtool 2.2.2)" && + cat <<\_ACEOF || at_write_fail=1 -Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software -Foundation, Inc. +Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +Free Software Foundation, Inc. This test suite is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit $at_write_fail fi -: ${tst_dist=dist} -: ${ACLOCAL=aclocal} -: ${AUTOHEADER=autoheader} -: ${AUTOCONF=autoconf} -: ${AUTOMAKE=automake} -: ${AUTORECONF=autoreconf} -for tool in ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF; do - if eval \$$tool --version >/dev/null 2>&1; then :; else eval $tool=no; fi + +# Should we print banners? at_groups is space-separated for entire test, +# newline-separated if only a subset of the testsuite is run. +case $at_groups in + *' '*' '* | *"$as_nl"*"$as_nl"* ) + at_print_banners=: ;; + * ) at_print_banners=false ;; +esac +# Text for banner N, set to empty once printed. +# Banner 1. libtoolize.at:26 +# Category starts at test group 1. +at_banner_text_1="Libtoolize operation." +# Banner 2. duplicate_members.at:25 +# Category starts at test group 11. +at_banner_text_2="Testing libtool functions." +# Banner 3. destdir.at:25 +# Category starts at test group 33. +at_banner_text_3="DESTDIR tests" +# Banner 4. old-m4-iface.at:26 +# Category starts at test group 35. +at_banner_text_4="Support for older m4 interface." +# Banner 5. am-subdir.at:26 +# Category starts at test group 37. +at_banner_text_5="Libtool subdir-objects support." +# Banner 6. lt_dlexit.at:28 +# Category starts at test group 39. +at_banner_text_6="Libltdl functionality." +# Banner 7. standalone.at:25 +# Category starts at test group 42. +at_banner_text_7="Standalone Libltdl." +# Banner 8. subproject.at:25 +# Category starts at test group 46. +at_banner_text_8="Subproject Libltdl." +# Banner 9. nonrecursive.at:26 +# Category starts at test group 50. +at_banner_text_9="Nonrecursive Automake Libltdl." +# Banner 10. recursive.at:25 +# Category starts at test group 53. +at_banner_text_10="Recursive Automake Libltdl." +# Banner 11. template.at:25 +# Category starts at test group 56. +at_banner_text_11="C++ template tests." +# Banner 12. ctor.at:25 +# Category starts at test group 58. +at_banner_text_12="Constructors." +# Banner 13. early-libtool.at:25 +# Category starts at test group 59. +at_banner_text_13="libtool script generation." +# Banner 14. deplibs-ident.at:25 +# Category starts at test group 61. +at_banner_text_14="Detecting identical deplibs." +# Banner 15. configure-iface.at:25 +# Category starts at test group 62. +at_banner_text_15="configure interface to libltdl." +# Banner 16. stresstest.at:30 +# Category starts at test group 65. +at_banner_text_16="Libtool stress test." + +# Take any -C into account. +if $at_change_dir ; then + if test x- = x$"at_dir" ; then + at_dir=./- + fi + test x != x"$at_dir" && cd "$at_dir" \ + || { $as_echo "$as_me: error: unable to change directory" >&2 + { (exit 1); exit 1; }; } + at_dir=`pwd` +fi + +# Load the config files for any default variable assignments. +for at_file in atconfig atlocal +do + test -r $at_file || continue + . ./$at_file || { $as_echo "$as_me: error: invalid content: $at_file" >&2 + { (exit 1); exit 1; }; } done -export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF -eval `$LIBTOOL --config | grep '^EGREP='` -eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|ECHO)='` -configure_options= -if test -n "$host_alias"; then - configure_options="--host $host_alias" + +# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix: +: ${at_top_build_prefix=$at_top_builddir} + +# Perform any assignments requested during argument parsing. +eval "$at_debug_args" + +# atconfig delivers names relative to the directory the test suite is +# in, but the groups themselves are run in testsuite-dir/group-dir. +if test -n "$at_top_srcdir"; then + builddir=../.. + for at_dir_var in srcdir top_srcdir top_build_prefix + do + at_val=`eval 'as_val=${'at_$at_dir_var'} + $as_echo "$as_val"'` + case $at_val in + [\\/$]* | ?:[\\/]* ) at_prefix= ;; + *) at_prefix=../../ ;; + esac + eval "$at_dir_var=\$at_prefix\$at_val" + done fi -if (FOO=bar; unset FOO) >/dev/null 2>&1; then - unset=unset -else - unset=false + +# The directory the whole suite works in. +# Should be absolute to let the user `cd' at will. +at_suite_dir=$at_dir/$as_me.dir +# The file containing the suite. +at_suite_log=$at_dir/$as_me.log +# The file containing the location of the last AT_CHECK. +at_check_line_file=$at_suite_dir/at-check-line +# The file containing the exit status of the last command. +at_status_file=$at_suite_dir/at-status +# The files containing the output of the tested commands. +at_stdout=$at_suite_dir/at-stdout +at_stder1=$at_suite_dir/at-stder1 +at_stderr=$at_suite_dir/at-stderr +# The file containing the function to run a test group. +at_test_source=$at_suite_dir/at-test-source +# The file containing dates. +at_times_file=$at_suite_dir/at-times + +if $at_clean; then + test -d "$at_suite_dir" && + find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \; + rm -f -r "$at_suite_dir" "$at_suite_log" + exit $? fi -: ${mkdir_p="$abs_top_srcdir/libltdl/config/install-sh -d"} # Don't take risks: use only absolute directories in PATH. # -# For stand-alone test suites, AUTOTEST_PATH is relative to `.'. +# For stand-alone test suites (ie. atconfig was not found), +# AUTOTEST_PATH is relative to `.'. # # For embedded test suites, AUTOTEST_PATH is relative to the top level # of the package. Then expand it into build/src parts, since users # may create executables in both places. -AUTOTEST_PATH=`echo $AUTOTEST_PATH | sed "s&:&$PATH_SEPARATOR&g"` +AUTOTEST_PATH=`$as_echo "$AUTOTEST_PATH" | sed "s|:|$PATH_SEPARATOR|g"` at_path= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $AUTOTEST_PATH $PATH @@ -1008,26 +1130,26 @@ IFS=$as_save_IFS # # There might be directories that don't exist, but don't redirect # builtins' (eg., cd) stderr directly: Ultrix's sh hates that. -PATH= +at_new_path= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $at_path do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` -test -d "$as_dir" || continue -case $PATH in - $as_dir | \ - $as_dir$PATH_SEPARATOR* | \ - *$PATH_SEPARATOR$as_dir | \ - *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR* ) ;; - - '') PATH=$as_dir ;; - *) PATH=$PATH$PATH_SEPARATOR$as_dir ;; + test -d "$as_dir" || continue +case $as_dir in + [\\/]* | ?:[\\/]* ) ;; + * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;; +esac +case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in + *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;; + $PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;; + *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;; esac done IFS=$as_save_IFS +PATH=$at_new_path export PATH # Setting up the FDs. @@ -1042,26 +1164,28 @@ exec 5>>"$at_suite_log" # Banners and logs. cat <<\_ASBOX -## ----------------------- ## -## libtool 2.2 test suite. ## -## ----------------------- ## +## ------------------------- ## +## libtool 2.2.2 test suite. ## +## ------------------------- ## _ASBOX { cat <<\_ASBOX -## ----------------------- ## -## libtool 2.2 test suite. ## -## ----------------------- ## +## ------------------------- ## +## libtool 2.2.2 test suite. ## +## ------------------------- ## _ASBOX echo - echo "$as_me: command line was:" - echo " $ $0 $at_cli_args" + $as_echo "$as_me: command line was:" + $as_echo " \$ $0 $at_cli_args" echo # Try to find a few ChangeLogs in case it might help determining the # exact version. Use the relative dir: if the top dir is a symlink, # find will not follow it (and options to follow the links are not - # portable), which would result in no output here. + # portable), which would result in no output here. Prune directories + # matching the package tarname, since they tend to be leftovers from + # `make dist' or `make distcheck' and contain redundant or stale logs. if test -n "$at_top_srcdir"; then cat <<\_ASBOX ## ----------- ## @@ -1069,14 +1193,16 @@ _ASBOX ## ----------- ## _ASBOX echo - for at_file in `find "$at_top_srcdir" -name ChangeLog -print` + for at_file in `find "$at_top_srcdir" -name "libtool-*" -prune -o -name ChangeLog -print` do - echo "$as_me: $at_file:" + $as_echo "$as_me: $at_file:" sed 's/^/| /;10q' $at_file echo done - { + fi + + { cat <<_ASUNAME ## --------- ## ## Platform. ## @@ -1106,23 +1232,186 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS } - echo - fi + echo # Contents of the config files. for at_file in atconfig atlocal do test -r $at_file || continue - echo "$as_me: $at_file:" + $as_echo "$as_me: $at_file:" sed 's/^/| /' $at_file echo done +} >&5 + +: ${tst_dist=dist} +: ${ACLOCAL=aclocal} +: ${AUTOHEADER=autoheader} +: ${AUTOCONF=autoconf} +: ${AUTOMAKE=automake} +: ${AUTORECONF=autoreconf} +for tool in ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF; do + if eval \$$tool --version >/dev/null 2>&1; then :; else eval $tool=no; fi +done +export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF +eval `$LIBTOOL --config | grep '^EGREP='` +eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|build_alias|ECHO)='` +configure_options= +if test -n "$host_alias"; then + configure_options="$configure_options --host $host_alias" +fi +if test -n "$build_alias"; then + configure_options="$configure_options --build $build_alias" +fi +if (FOO=bar; unset FOO) >/dev/null 2>&1; then + unset=unset +else + unset=false +fi +: ${mkdir_p="$abs_top_srcdir/libltdl/config/install-sh -d"} + +## --------------- ## +## Shell functions ## +## --------------- ## + +# at_func_banner NUMBER +# --------------------- +# Output banner NUMBER, provided the testsuite is running multiple groups +# and this particular banner has not yet been printed. +at_func_banner () +{ + $at_print_banners || return 0 + eval at_banner_text=\$at_banner_text_$1 + test "x$at_banner_text" = x && return 0 + eval at_banner_text_$1= + $as_echo "$as_nl$at_banner_text$as_nl" +} # at_func_banner + +# at_func_check_newline COMMAND +# ----------------------------- +# Test if COMMAND includes a newline and, if so, print a message and return +# exit code 1 +at_func_check_newline () +{ + case "$1" in + *' +'*) echo 'Not enabling shell tracing (command contains an embedded newline)' + return 1 ;; + *) return 0 ;; + esac +} + +# at_func_filter_trace EXIT-CODE +# ------------------------------ +# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr) +# and the other lines (on file "$at_stderr"). Return the exit code EXIT-CODE. +at_func_filter_trace () +{ + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" + return $1 +} + +# at_func_log_failure FILE-LIST +# ----------------------------- +# Copy the files in the list on stdout with a "> " prefix, and exit the shell +# with a failure exit code. +at_func_log_failure () +{ + for file + do $as_echo "$file:"; sed 's/^/> /' "$file"; done + echo 1 > "$at_status_file" + exit 1 +} + +# at_func_check_skip EXIT-CODE +# ---------------------------- +# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell +# with that same exit code. +at_func_check_skip () +{ + case $1 in + 77) echo 77 > "$at_status_file"; exit 77;; + esac +} + +# at_func_check_status EXPECTED EXIT-CODE LINE +# -------------------------------------------- +# Check whether EXIT-CODE is the expected exit code, and if so do nothing. +# Otherwise, if it is 77 exit the shell with that same exit code; if it is +# anything else print an error message and fail the test. +at_func_check_status () +{ + case $2 in + $1 ) ;; + 77) echo 77 > "$at_status_file"; exit 77;; + *) $as_echo "$3: exit code was $2, expected $1" + at_failed=:;; + esac +} + +# at_func_diff_devnull FILE +# ------------------------- +# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless +# diff invocations. +at_func_diff_devnull () +{ + test -s "$1" || return 0 + $at_diff "$at_devnull" "$1" +} + +# at_func_test NUMBER +# ------------------- +# Parse out test NUMBER from the tail of this file. +at_func_test () +{ + eval at_sed=\$at_sed$1 + sed "$at_sed" "$at_myself" > "$at_test_source" +} + +# at_func_create_debugging_script +# ------------------------------- +# Create the debugging script $at_group_dir/run which will reproduce the +# current test group. +at_func_create_debugging_script () +{ + { + echo "#! /bin/sh" && + echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' && + $as_echo "cd '$at_dir'" && + $as_echo "exec \${CONFIG_SHELL-$SHELL} \"$at_myself\" -v -d $at_debug_args $at_group \${1+\"\$@\"}" && + echo 'exit 1' + } >"$at_group_dir/run" && + chmod +x "$at_group_dir/run" +} + +# at_func_arith +# ------------- +# Arithmetic evaluation, avoids expr if the shell is sane. +# +# subshell and eval are needed to keep Solaris sh from bailing out: +if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then + # With "$@", bash does not split positional parameters: + eval 'at_func_arith () + { + at_func_arith_result=$(( $* )) + }' +else + at_func_arith () + { + at_func_arith_result=`expr "$@"` + } +fi +## ---------------------- ## +## End of shell functions ## +## ---------------------- ## +{ cat <<\_ASBOX ## ---------------- ## ## Tested programs. ## @@ -1146,13 +1435,13 @@ IFS=$as_save_IFS if test -f "$as_dir/$at_program"; then { - echo "$at_srcdir/testsuite.at:329: $as_dir/$at_program --version" - "$as_dir/$at_program" --version + $as_echo "$at_srcdir/testsuite.at:359: $as_dir/$at_program --version" + "$as_dir/$at_program" --version &5 2>&1 else - { { echo "$as_me:$LINENO: error: cannot find $at_program" >&5 -echo "$as_me: error: cannot find $at_program" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5 +$as_echo "$as_me: error: cannot find $at_program" >&2;} { (exit 1); exit 1; }; } fi done @@ -1167,7 +1456,7 @@ _ASBOX at_start_date=`date` at_start_time=`date +%s 2>/dev/null` -echo "$as_me: starting at: $at_start_date" >&5 +$as_echo "$as_me: starting at: $at_start_date" >&5 at_xpass_list= at_xfail_list= at_pass_list= @@ -1178,8 +1467,8 @@ at_group_count=0 # Create the master directory if it doesn't already exist. test -d "$at_suite_dir" || mkdir "$at_suite_dir" || - { { echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5 -echo "$as_me: error: cannot create '$at_suite_dir'" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5 +$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;} { (exit 1); exit 1; }; } # Can we diff with `/dev/null'? DU 5.0 refuses. @@ -1198,37 +1487,59 @@ else at_diff=diff fi +# Get the last needed group. +for at_group in : $at_groups; do :; done +# Extract the start and end lines of each test group at the tail +# of this file +awk ' +BEGIN { FS="" } +/^#AT_START_/ { + start = NR +} +/^#AT_STOP_/ { + test = substr ($ 0, 10) + print "at_sed" test "=\"1," start "d;" (NR-1) "q\"" + if (test == "'"$at_group"'") exit +}' "$at_myself" > "$at_test_source" && +. "$at_test_source" || + { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5 +$as_echo "$as_me: error: cannot create test line number cache" >&2;} + { (exit 1); exit 1; }; } + + +## ------------ ## +## Driver loop. ## +## ------------ ## for at_group in $at_groups do # Be sure to come back to the top test directory. cd "$at_suite_dir" - case $at_group in - banner-*) - at_group_log=$at_suite_log - ;; + # Clearly separate the test groups when verbose. + test $at_group_count != 0 && $at_verbose echo - *) - at_group_normalized=$at_group + at_group_normalized=$at_group - while :; do + eval 'while :; do case $at_group_normalized in #( - $at_format*) break;; + '"$at_format"'*) break;; esac at_group_normalized=0$at_group_normalized - done + done' - # Create a fresh directory for the next test group, and enter. - at_group_dir=$at_suite_dir/$at_group_normalized - at_group_log=$at_group_dir/$as_me.log - if test -d "$at_group_dir"; then - find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \; - rm -fr "$at_group_dir" - fi - # Be tolerant if the above `rm' was not able to remove the directory. - { as_dir=$at_group_dir + # Create a fresh directory for the next test group, and enter. + at_group_dir=$at_suite_dir/$at_group_normalized + at_group_log=$at_group_dir/$as_me.log + if test -d "$at_group_dir"; then + find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \; + rm -fr "$at_group_dir" || + { $as_echo "$as_me:$LINENO: WARNING: test directory could not be cleaned." >&5 +$as_echo "$as_me: WARNING: test directory could not be cleaned." >&2;} + fi + # Be tolerant if the above `rm' was not able to remove the directory. + { as_dir="$at_group_dir" case $as_dir in #( -*) as_dir=./$as_dir;; esac @@ -1236,7 +1547,7 @@ do as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -1245,7 +1556,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1266,61 +1577,342 @@ echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - cd $at_group_dir - ;; - esac + cd "$at_group_dir" echo 0 > "$at_status_file" - # Clearly separate the test groups when verbose. - test $at_group_count != 0 && $at_verbose - # In verbose mode, append to the log file *and* show on # the standard output; in quiet mode only write to the log - if test $at_verbose = echo; then + if test -z "$at_verbose"; then at_tee_pipe='tee -a "$at_group_log"' else at_tee_pipe='cat >> "$at_group_log"' fi - case $at_group in - - banner-1 ) # Banner 1. libtoolize.at:26 - cat <<\_ATEOF + if at_func_test $at_group && . "$at_test_source"; then :; else + $as_echo "$as_me: unable to parse test group: $at_group" >&2 + at_failed=: + fi -Libtoolize operation. + # Be sure to come back to the suite directory, in particular + # since below we might `rm' the group directory we are in currently. + cd "$at_suite_dir" + if test ! -f "$at_check_line_file"; then + sed "s/^ */$as_me: warning: /" <<_ATEOF + A failure happened in a test group before any test could be + run. This means that test suite is improperly designed. Please + report this failure to . _ATEOF - ;; - - 1 ) # 1. libtoolize.at:79: libtoolize macro installation - at_setup_line='libtoolize.at:79' - at_desc="libtoolize macro installation" - $at_quiet $ECHO_N " 1: libtoolize macro installation $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "1. libtoolize.at:79: testing ..." - $at_traceon + $as_echo "$at_setup_line" >"$at_check_line_file" + fi + at_func_arith 1 + $at_group_count + at_group_count=$at_func_arith_result + $at_verbose $as_echo_n "$at_group. $at_setup_line: " + $as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log" + case $at_xfail:$at_status in + yes:0) + at_msg="UNEXPECTED PASS" + at_xpass_list="$at_xpass_list $at_group" + at_errexit=$at_errexit_p + ;; + no:0) + at_msg="ok" + at_pass_list="$at_pass_list $at_group" + at_errexit=false + ;; + *:77) + at_msg='skipped ('`cat "$at_check_line_file"`')' + at_skip_list="$at_skip_list $at_group" + at_errexit=false + ;; + yes:*) + at_msg='expected failure ('`cat "$at_check_line_file"`')' + at_xfail_list="$at_xfail_list $at_group" + at_errexit=false + ;; + no:*) + at_msg='FAILED ('`cat "$at_check_line_file"`')' + at_fail_list="$at_fail_list $at_group" + at_errexit=$at_errexit_p + ;; + esac + # Make sure there is a separator even with long titles. + $as_echo " $at_msg" + at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg" + case $at_status in + 0|77) + # $at_times_file is only available if the group succeeded. + # We're not including the group log, so the success message + # is written in the global log separately. But we also + # write to the group log in case they're using -d. + if test -f "$at_times_file"; then + at_log_msg="$at_log_msg ("`sed 1d "$at_times_file"`')' + rm -f "$at_times_file" + fi + $as_echo "$at_log_msg" >> "$at_group_log" + $as_echo "$at_log_msg" >&5 + # Cleanup the group directory, unless the user wants the files. + if $at_debug_p ; then + at_func_create_debugging_script + else + if test -d "$at_group_dir"; then + find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \; + rm -fr "$at_group_dir" + fi + rm -f "$at_test_source" + fi + ;; + *) + # Upon failure, include the log into the testsuite's global + # log. The failure message is written in the group log. It + # is later included in the global log. + $as_echo "$at_log_msg" >> "$at_group_log" + + # Upon failure, keep the group directory for autopsy, and + # create the debugging script. + at_func_create_debugging_script + $at_errexit && break + ;; + esac +done -cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_MACRO_DIR([m4]) -LT_INIT -AC_OUTPUT -_ATEOF +# Back to the top directory. +cd "$at_dir" +# Compute the duration of the suite. +at_stop_date=`date` +at_stop_time=`date +%s 2>/dev/null` +$as_echo "$as_me: ending at: $at_stop_date" >&5 +case $at_start_time,$at_stop_time in + [0-9]*,[0-9]*) + at_func_arith $at_stop_time - $at_start_time + at_duration_s=$at_func_arith_result + at_func_arith $at_duration_s / 60 + at_duration_m=$at_func_arith_result + at_func_arith $at_duration_m / 60 + at_duration_h=$at_func_arith_result + at_func_arith $at_duration_s % 60 + at_duration_s=$at_func_arith_result + at_func_arith $at_duration_m % 60 + at_duration_m=$at_func_arith_result + at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s" + $as_echo "$as_me: test suite duration: $at_duration" >&5 + ;; +esac +# Wrap up the test suite with summary statistics. +set X $at_skip_list; shift; at_skip_count=$# +set X $at_fail_list; shift; at_fail_count=$# +set X $at_xpass_list; shift; at_xpass_count=$# +set X $at_xfail_list; shift; at_xfail_count=$# + +at_func_arith $at_group_count - $at_skip_count +at_run_count=$at_func_arith_result +at_func_arith $at_xpass_count + $at_fail_count +at_unexpected_count=$at_func_arith_result +at_func_arith $at_xfail_count + $at_fail_count +at_total_fail_count=$at_func_arith_result -cat >expout <<'_ATEOF' -libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'. -libtoolize: copying file `build-aux/ltmain.sh' -libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. +echo +cat <<\_ASBOX +## ------------- ## +## Test results. ## +## ------------- ## +_ASBOX +echo +{ + echo + cat <<\_ASBOX +## ------------- ## +## Test results. ## +## ------------- ## +_ASBOX + echo +} >&5 + +if test $at_run_count = 1; then + at_result="1 test" + at_were=was +else + at_result="$at_run_count tests" + at_were=were +fi +if $at_errexit_p && test $at_unexpected_count != 0; then + if test $at_xpass_count = 1; then + at_result="$at_result $at_were run, one passed" + else + at_result="$at_result $at_were run, one failed" + fi + at_result="$at_result unexpectedly and inhibited subsequent tests." +else + # Don't you just love exponential explosion of the number of cases? + case $at_xpass_count:$at_fail_count:$at_xfail_count in + # So far, so good. + 0:0:0) at_result="$at_result $at_were successful." ;; + 0:0:*) at_result="$at_result behaved as expected." ;; + + # Some unexpected failures + 0:*:0) at_result="$at_result $at_were run, +$at_fail_count failed unexpectedly." ;; + + # Some failures, both expected and unexpected + 0:*:1) at_result="$at_result $at_were run, +$at_total_fail_count failed ($at_xfail_count expected failure)." ;; + 0:*:*) at_result="$at_result $at_were run, +$at_total_fail_count failed ($at_xfail_count expected failures)." ;; + + # No unexpected failures, but some xpasses + *:0:*) at_result="$at_result $at_were run, +$at_xpass_count passed unexpectedly." ;; + + # No expected failures, but failures and xpasses + *:1:0) at_result="$at_result $at_were run, +$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;; + *:*:0) at_result="$at_result $at_were run, +$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;; + + # All of them. + *:*:1) at_result="$at_result $at_were run, +$at_xpass_count passed unexpectedly, +$at_total_fail_count failed ($at_xfail_count expected failure)." ;; + *:*:*) at_result="$at_result $at_were run, +$at_xpass_count passed unexpectedly, +$at_total_fail_count failed ($at_xfail_count expected failures)." ;; + esac + + if test $at_skip_count = 0 && test $at_run_count -gt 1; then + at_result="All $at_result" + fi +fi + +# Now put skips in the mix. +case $at_skip_count in + 0) ;; + 1) at_result="$at_result +1 test was skipped." ;; + *) at_result="$at_result +$at_skip_count tests were skipped." ;; +esac + +if test $at_unexpected_count = 0; then + echo "$at_result" + echo "$at_result" >&5 +else + echo "ERROR: $at_result" >&2 + echo "ERROR: $at_result" >&5 + { + echo + cat <<\_ASBOX +## ------------------------ ## +## Summary of the failures. ## +## ------------------------ ## +_ASBOX + + # Summary of failed and skipped tests. + if test $at_fail_count != 0; then + echo "Failed tests:" + $SHELL "$at_myself" $at_fail_list --list + echo + fi + if test $at_skip_count != 0; then + echo "Skipped tests:" + $SHELL "$at_myself" $at_skip_list --list + echo + fi + if test $at_xpass_count != 0; then + echo "Unexpected passes:" + $SHELL "$at_myself" $at_xpass_list --list + echo + fi + if test $at_fail_count != 0; then + cat <<\_ASBOX +## ---------------------- ## +## Detailed failed tests. ## +## ---------------------- ## +_ASBOX + echo + for at_group in $at_fail_list + do + at_group_normalized=$at_group + + eval 'while :; do + case $at_group_normalized in #( + '"$at_format"'*) break;; + esac + at_group_normalized=0$at_group_normalized + done' + + cat "$at_suite_dir/$at_group_normalized/$as_me.log" + echo + done + echo + fi + if test -n "$at_top_srcdir"; then + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## ${at_top_build_prefix}config.log ## +_ASBOX + sed 's/^/| /' ${at_top_build_prefix}config.log + echo + fi + } >&5 + + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## $as_me.log was created. ## +_ASBOX + + echo + $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help: + + To: + Subject: [libtool 2.2.2] $as_me:$at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}$at_xpass_list${at_xpass_list:+ passed unexpectedly} +" + if test $at_debug_p = false; then + echo + echo 'You may investigate any problem if you feel able to do so, in which' + echo 'case the test suite provides a good starting point. Its output may' + $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'." + echo + fi + exit 1 +fi + +exit 0 + +## ------------- ## +## Actual tests. ## +## ------------- ## +#AT_START_1 +# 1. libtoolize.at:79: libtoolize macro installation +at_setup_line='libtoolize.at:79' +at_func_banner 1 +at_desc="libtoolize macro installation" +$at_quiet $as_echo_n " 1: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "1. libtoolize.at:79: testing ..." + $at_traceon + + +cat >configure.ac <<'_ATEOF' +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) +LT_INIT +AC_OUTPUT +_ATEOF + + + +cat >expout <<'_ATEOF' +libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'. +libtoolize: copying file `build-aux/ltmain.sh' +libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' @@ -1329,70 +1921,56 @@ libtoolize: copying file `m4/lt~obsolete _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:94: $LIBTOOLIZE --copy +$as_echo "$at_srcdir/libtoolize.at:94: $LIBTOOLIZE --copy " echo libtoolize.at:94 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy + ( $at_traceon; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy + ( :; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:94: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:94" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 2 ) # 2. libtoolize.at:103: libtoolize macro serial update - at_setup_line='libtoolize.at:103' - at_desc="libtoolize macro serial update" - $at_quiet $ECHO_N " 2: libtoolize macro serial update $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "2. libtoolize.at:103: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_1 +#AT_START_2 +# 2. libtoolize.at:103: libtoolize macro serial update +at_setup_line='libtoolize.at:103' +at_func_banner 1 +at_desc="libtoolize macro serial update" +$at_quiet $as_echo_n " 2: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "2. libtoolize.at:103: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) LT_INIT @@ -1460,47 +2038,35 @@ libtoolize: `m4/ltoptions.m4' is newer: _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < experr > experr.t +mv -f experr.t experr $at_traceoff -echo "$at_srcdir/libtoolize.at:127: $LIBTOOLIZE --copy +$as_echo "$at_srcdir/libtoolize.at:127: $LIBTOOLIZE --copy " echo libtoolize.at:127 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy + ( $at_traceon; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy + ( :; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false $at_diff experr "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:127: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:127" +$at_failed && at_func_log_failure $at_traceon @@ -1526,47 +2092,35 @@ libtoolize: `m4/ltoptions.m4' is newer: _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < experr > experr.t +mv -f experr.t experr $at_traceoff -echo "$at_srcdir/libtoolize.at:148: $LIBTOOLIZE --copy +$as_echo "$at_srcdir/libtoolize.at:148: $LIBTOOLIZE --copy " echo libtoolize.at:148 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy + ( $at_traceon; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy + ( :; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false $at_diff experr "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:148: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:148" +$at_failed && at_func_log_failure $at_traceon @@ -1588,47 +2142,32 @@ libtoolize: copying file `m4/lt~obsolete _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:166: $LIBTOOLIZE --copy --force +$as_echo "$at_srcdir/libtoolize.at:166: $LIBTOOLIZE --copy --force " echo libtoolize.at:166 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --force + ( $at_traceon; $LIBTOOLIZE --copy --force ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --force + ( :; $LIBTOOLIZE --copy --force ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:166: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:166" +$at_failed && at_func_log_failure $at_traceon @@ -1650,71 +2189,57 @@ libtoolize: `m4/lt~obsolete.m4' is alrea _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:184: $LIBTOOLIZE --copy +$as_echo "$at_srcdir/libtoolize.at:184: $LIBTOOLIZE --copy " echo libtoolize.at:184 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy + ( $at_traceon; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy + ( :; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:184: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:184" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 3 ) # 3. libtoolize.at:194: libtoolize config files serial update - at_setup_line='libtoolize.at:194' - at_desc="libtoolize config files serial update" - $at_quiet $ECHO_N " 3: libtoolize config files serial update $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "3. libtoolize.at:194: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_2 +#AT_START_3 +# 3. libtoolize.at:194: libtoolize config files serial update +at_setup_line='libtoolize.at:194' +at_func_banner 1 +at_desc="libtoolize config files serial update" +$at_quiet $as_echo_n " 3: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "3. libtoolize.at:194: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) LT_INIT @@ -1785,47 +2310,35 @@ libtoolize: `m4/ltoptions.m4' is newer: _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < experr > experr.t +mv -f experr.t experr $at_traceoff -echo "$at_srcdir/libtoolize.at:221: $LIBTOOLIZE --copy --install +$as_echo "$at_srcdir/libtoolize.at:221: $LIBTOOLIZE --copy --install " echo libtoolize.at:221 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --install + ( $at_traceon; $LIBTOOLIZE --copy --install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --install + ( :; $LIBTOOLIZE --copy --install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false $at_diff experr "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:221: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:221" +$at_failed && at_func_log_failure $at_traceon @@ -1854,48 +2367,36 @@ libtoolize: `m4/ltoptions.m4' is newer: _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < experr > experr.t +mv -f experr.t experr $at_traceoff -echo "$at_srcdir/libtoolize.at:245: $LIBTOOLIZE --copy --install +$as_echo "$at_srcdir/libtoolize.at:245: $LIBTOOLIZE --copy --install " echo libtoolize.at:245 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --install + ( $at_traceon; $LIBTOOLIZE --copy --install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --install + ( :; $LIBTOOLIZE --copy --install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false $at_diff experr "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:245: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:245" - - echo 1 > "$at_status_file" - exit 1 -fi - -$at_traceon +$at_failed && at_func_log_failure +$at_traceon @@ -1919,47 +2420,32 @@ libtoolize: copying file `m4/lt~obsolete _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:266: $LIBTOOLIZE --copy --force --install +$as_echo "$at_srcdir/libtoolize.at:266: $LIBTOOLIZE --copy --force --install " echo libtoolize.at:266 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --force --install + ( $at_traceon; $LIBTOOLIZE --copy --force --install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --force --install + ( :; $LIBTOOLIZE --copy --force --install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:266: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:266" +$at_failed && at_func_log_failure $at_traceon @@ -1984,66 +2470,52 @@ libtoolize: `m4/lt~obsolete.m4' is alrea _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:287: $LIBTOOLIZE --copy --install +$as_echo "$at_srcdir/libtoolize.at:287: $LIBTOOLIZE --copy --install " echo libtoolize.at:287 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --install + ( $at_traceon; $LIBTOOLIZE --copy --install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --install + ( :; $LIBTOOLIZE --copy --install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:287: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:287" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 4 ) # 4. libtoolize.at:296: diagnose missing LT_CONFIG_LTDL_DIR - at_setup_line='libtoolize.at:296' - at_desc="diagnose missing LT_CONFIG_LTDL_DIR" - $at_quiet $ECHO_N " 4: diagnose missing LT_CONFIG_LTDL_DIR $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "4. libtoolize.at:296: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_3 +#AT_START_4 +# 4. libtoolize.at:296: diagnose missing LT_CONFIG_LTDL_DIR +at_setup_line='libtoolize.at:296' +at_func_banner 1 +at_desc="diagnose missing LT_CONFIG_LTDL_DIR" +$at_quiet $as_echo_n " 4: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "4. libtoolize.at:296: testing ..." + $at_traceon cat >expout <<'_ATEOF' @@ -2095,7 +2567,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) LT_INIT @@ -2104,66 +2576,52 @@ AC_OUTPUT _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:354: $LIBTOOLIZE --copy --install --ltdl=ltdl +$as_echo "$at_srcdir/libtoolize.at:354: $LIBTOOLIZE --copy --install --ltdl=ltdl " echo libtoolize.at:354 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --install --ltdl=ltdl + ( $at_traceon; $LIBTOOLIZE --copy --install --ltdl=ltdl ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --install --ltdl=ltdl + ( :; $LIBTOOLIZE --copy --install --ltdl=ltdl ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:354: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:354" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 5 ) # 5. libtoolize.at:436: copy ltdl.m4 with shared macro directory - at_setup_line='libtoolize.at:436' - at_desc="copy ltdl.m4 with shared macro directory" - $at_quiet $ECHO_N " 5: copy ltdl.m4 with shared macro directory $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "5. libtoolize.at:436: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_4 +#AT_START_5 +# 5. libtoolize.at:436: copy ltdl.m4 with shared macro directory +at_setup_line='libtoolize.at:436' +at_func_banner 1 +at_desc="copy ltdl.m4 with shared macro directory" +$at_quiet $as_echo_n " 5: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "5. libtoolize.at:436: testing ..." + $at_traceon cat >expout <<'_ATEOF' @@ -2222,7 +2680,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -2233,66 +2691,52 @@ _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:440: $LIBTOOLIZE --ltdl +$as_echo "$at_srcdir/libtoolize.at:440: $LIBTOOLIZE --ltdl " echo libtoolize.at:440 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --ltdl + ( $at_traceon; $LIBTOOLIZE --ltdl ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --ltdl + ( :; $LIBTOOLIZE --ltdl ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:440: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:440" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 6 ) # 6. libtoolize.at:448: correctly parse LTDL_INIT from configure.ac - at_setup_line='libtoolize.at:448' - at_desc="correctly parse LTDL_INIT from configure.ac" - $at_quiet $ECHO_N " 6: correctly parse LTDL_INIT from configure.ac $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "6. libtoolize.at:448: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_5 +#AT_START_6 +# 6. libtoolize.at:448: correctly parse LTDL_INIT from configure.ac +at_setup_line='libtoolize.at:448' +at_func_banner 1 +at_desc="correctly parse LTDL_INIT from configure.ac" +$at_quiet $as_echo_n " 6: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "6. libtoolize.at:448: testing ..." + $at_traceon cat >expout <<'_ATEOF' @@ -2351,7 +2795,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -2362,66 +2806,52 @@ _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:452: $LIBTOOLIZE +$as_echo "$at_srcdir/libtoolize.at:452: $LIBTOOLIZE " echo libtoolize.at:452 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE + ( $at_traceon; $LIBTOOLIZE ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE + ( :; $LIBTOOLIZE ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:452: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:452" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 7 ) # 7. libtoolize.at:460: diagnose missing LTDL_INIT invocation - at_setup_line='libtoolize.at:460' - at_desc="diagnose missing LTDL_INIT invocation" - $at_quiet $ECHO_N " 7: diagnose missing LTDL_INIT invocation $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "7. libtoolize.at:460: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_6 +#AT_START_7 +# 7. libtoolize.at:460: diagnose missing LTDL_INIT invocation +at_setup_line='libtoolize.at:460' +at_func_banner 1 +at_desc="diagnose missing LTDL_INIT invocation" +$at_quiet $as_echo_n " 7: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "7. libtoolize.at:460: testing ..." + $at_traceon cat >expout <<'_ATEOF' @@ -2481,7 +2911,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -2490,71 +2920,57 @@ AC_OUTPUT _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:526: $LIBTOOLIZE --ltdl --copy +$as_echo "$at_srcdir/libtoolize.at:526: $LIBTOOLIZE --ltdl --copy " echo libtoolize.at:526 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --ltdl --copy + ( $at_traceon; $LIBTOOLIZE --ltdl --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --ltdl --copy + ( :; $LIBTOOLIZE --ltdl --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:526: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:526" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 8 ) # 8. libtoolize.at:536: upgrading verbatim style aclocal.m4 - at_setup_line='libtoolize.at:536' - at_desc="upgrading verbatim style aclocal.m4" - $at_quiet $ECHO_N " 8: upgrading verbatim style aclocal.m4 $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_7 +#AT_START_8 +# 8. libtoolize.at:536: upgrading verbatim style aclocal.m4 +at_setup_line='libtoolize.at:536' +at_func_banner 1 +at_desc="upgrading verbatim style aclocal.m4" +$at_quiet $as_echo_n " 8: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "8. libtoolize.at:536: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "8. libtoolize.at:536: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_AUX_DIR([build-aux]) LT_INIT AC_OUTPUT @@ -2572,47 +2988,32 @@ libtoolize: \`$tst_aclocaldir/ltsugar. libtoolize: \`$tst_aclocaldir/lt~obsolete.m4' EOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:556: $LIBTOOLIZE --copy +$as_echo "$at_srcdir/libtoolize.at:556: $LIBTOOLIZE --copy " echo libtoolize.at:556 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy + ( $at_traceon; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy + ( :; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:556: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:556" +$at_failed && at_func_log_failure $at_traceon @@ -2623,7 +3024,7 @@ $at_traceon ## --------------------------------------- ## cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) LT_INIT @@ -2660,47 +3061,32 @@ libtoolize: You should add the contents _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:598: $LIBTOOLIZE --copy +$as_echo "$at_srcdir/libtoolize.at:598: $LIBTOOLIZE --copy " echo libtoolize.at:598 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy + ( $at_traceon; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy + ( :; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:598: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:598" +$at_failed && at_func_log_failure $at_traceon @@ -2711,44 +3097,23 @@ $at_traceon ## ------------------------------------------- ## $at_traceoff -echo "$at_srcdir/libtoolize.at:605: \$ACLOCAL -I m4" +$as_echo "$at_srcdir/libtoolize.at:605: \$ACLOCAL -I m4" echo libtoolize.at:605 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I m4"; then + ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:605: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:605" +$at_failed && at_func_log_failure $at_traceon @@ -2788,47 +3153,35 @@ libtoolize: `m4/ltoptions.m4' is newer: _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < experr > experr.t +mv -f experr.t experr $at_traceoff -echo "$at_srcdir/libtoolize.at:634: $LIBTOOLIZE --copy +$as_echo "$at_srcdir/libtoolize.at:634: $LIBTOOLIZE --copy " echo libtoolize.at:634 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy + ( $at_traceon; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy + ( :; $LIBTOOLIZE --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false $at_diff experr "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:634: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:634" +$at_failed && at_func_log_failure $at_traceon @@ -2849,66 +3202,52 @@ libtoolize: copying file `m4/lt~obsolete _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:651: $LIBTOOLIZE --copy --force +$as_echo "$at_srcdir/libtoolize.at:651: $LIBTOOLIZE --copy --force " echo libtoolize.at:651 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --force + ( $at_traceon; $LIBTOOLIZE --copy --force ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --force + ( :; $LIBTOOLIZE --copy --force ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:651: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:651" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 9 ) # 9. libtoolize.at:660: nonrecursive ltdl with AC_CONFIG_MACRO_DIR - at_setup_line='libtoolize.at:660' - at_desc="nonrecursive ltdl with AC_CONFIG_MACRO_DIR" - $at_quiet $ECHO_N " 9: nonrecursive ltdl with AC_CONFIG_MACRO_DIR $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "9. libtoolize.at:660: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_8 +#AT_START_9 +# 9. libtoolize.at:660: nonrecursive ltdl with AC_CONFIG_MACRO_DIR +at_setup_line='libtoolize.at:660' +at_func_banner 1 +at_desc="nonrecursive ltdl with AC_CONFIG_MACRO_DIR" +$at_quiet $as_echo_n " 9: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "9. libtoolize.at:660: testing ..." + $at_traceon cat >expout <<'_ATEOF' @@ -2959,7 +3298,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -2969,66 +3308,52 @@ AC_OUTPUT _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:718: $LIBTOOLIZE --copy --install --ltdl=ltdl +$as_echo "$at_srcdir/libtoolize.at:718: $LIBTOOLIZE --copy --install --ltdl=ltdl " echo libtoolize.at:718 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --install --ltdl=ltdl + ( $at_traceon; $LIBTOOLIZE --copy --install --ltdl=ltdl ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --install --ltdl=ltdl + ( :; $LIBTOOLIZE --copy --install --ltdl=ltdl ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:718: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:718" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 10 ) # 10. libtoolize.at:727: subproject ltdl with non-shared directories - at_setup_line='libtoolize.at:727' - at_desc="subproject ltdl with non-shared directories" - $at_quiet $ECHO_N " 10: subproject ltdl with non-shared directories $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "10. libtoolize.at:727: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_9 +#AT_START_10 +# 10. libtoolize.at:727: subproject ltdl with non-shared directories +at_setup_line='libtoolize.at:727' +at_func_banner 1 +at_desc="subproject ltdl with non-shared directories" +$at_quiet $as_echo_n " 10: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "10. libtoolize.at:727: testing ..." + $at_traceon cat >expout <<'_ATEOF' @@ -3102,7 +3427,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([libtoolize-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtoolize-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([acm4]) @@ -3112,75 +3437,52 @@ AC_OUTPUT _ATEOF +lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < expout > expout.t +mv -f expout.t expout $at_traceoff -echo "$at_srcdir/libtoolize.at:808: $LIBTOOLIZE --copy --install +$as_echo "$at_srcdir/libtoolize.at:808: $LIBTOOLIZE --copy --install " echo libtoolize.at:808 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --install + ( $at_traceon; $LIBTOOLIZE --copy --install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --install + ( :; $LIBTOOLIZE --copy --install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/libtoolize.at:808: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/libtoolize.at:808" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-2 ) # Banner 2. duplicate_members.at:25 - cat <<\_ATEOF - -Testing libtool functions. - -_ATEOF - ;; - - 11 ) # 11. duplicate_members.at:26: duplicate members in archive tests - at_setup_line='duplicate_members.at:26' - at_desc="duplicate members in archive tests" - $at_quiet $ECHO_N " 11: duplicate members in archive tests $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "11. duplicate_members.at:26: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_10 +#AT_START_11 +# 11. duplicate_members.at:26: duplicate members in archive tests +at_setup_line='duplicate_members.at:26' +at_func_banner 2 +at_desc="duplicate members in archive tests" +$at_quiet $as_echo_n " 11: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "11. duplicate_members.at:26: testing ..." + $at_traceon @@ -3230,69 +3532,55 @@ $LIBTOOL --mode=link --tag=CC $CC $CFLAG $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o main.lo main.c $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo ./libbar.la + + $at_traceoff -echo "$at_srcdir/duplicate_members.at:73: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/duplicate_members.at:73: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo duplicate_members.at:73 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_members.at:73: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_members.at:73" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 12 ) # 12. duplicate_conv.at:25: duplicate convenience archive names - at_setup_line='duplicate_conv.at:25' - at_desc="duplicate convenience archive names" - $at_quiet $ECHO_N " 12: duplicate convenience archive names $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "12. duplicate_conv.at:25: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_11 +#AT_START_12 +# 12. duplicate_conv.at:25: duplicate convenience archive names +at_setup_line='duplicate_conv.at:25' +at_func_banner 2 +at_desc="duplicate convenience archive names" +$at_quiet $as_echo_n " 12: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "12. duplicate_conv.at:25: testing ..." + $at_traceon @@ -3320,131 +3608,74 @@ $LIBTOOL --mode=link --tag=CC $CC $CFLAG # Fold into convenience archive. $at_traceoff -echo "$at_srcdir/duplicate_conv.at:51: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o libcee.la c.lo a/liba.la b/liba.la" -echo duplicate_conv.at:51 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libcee.la c.lo a/liba.la b/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/duplicate_conv.at:52: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o libcee.la c.lo a/liba.la b/liba.la" +echo duplicate_conv.at:52 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libcee.la c.lo a/liba.la b/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:51: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:52" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/duplicate_conv.at:53: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT ./libcee.la" -echo duplicate_conv.at:53 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/duplicate_conv.at:54: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT ./libcee.la" +echo duplicate_conv.at:54 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:53: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:54" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/duplicate_conv.at:55: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/duplicate_conv.at:55: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo duplicate_conv.at:55 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:55: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:55" +$at_failed && at_func_log_failure $at_traceon @@ -3456,131 +3687,74 @@ $LIBTOOL --mode=clean rm -f libcee.la # Fold into static library. $at_traceoff -echo "$at_srcdir/duplicate_conv.at:63: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -rpath /foo -static -o libcee.la c.lo a/liba.la b/liba.la" -echo duplicate_conv.at:63 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -static -o libcee.la c.lo a/liba.la b/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/duplicate_conv.at:64: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -rpath /foo -static -o libcee.la c.lo a/liba.la b/liba.la" +echo duplicate_conv.at:64 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -static -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -static -o libcee.la c.lo a/liba.la b/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -static -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -static -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -static -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:63: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:64" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/duplicate_conv.at:65: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT ./libcee.la" -echo duplicate_conv.at:65 >"$at_check_line_file" +$as_echo "$at_srcdir/duplicate_conv.at:66: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT ./libcee.la" +echo duplicate_conv.at:66 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:65: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:66" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/duplicate_conv.at:67: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/duplicate_conv.at:67: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo duplicate_conv.at:67 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:67: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:67" +$at_failed && at_func_log_failure $at_traceon @@ -3588,131 +3762,74 @@ $LIBTOOL --mode=clean rm -f libcee.la # Fold into library. $at_traceoff -echo "$at_srcdir/duplicate_conv.at:71: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -rpath /foo -o libcee.la c.lo a/liba.la b/liba.la" -echo duplicate_conv.at:71 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -o libcee.la c.lo a/liba.la b/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/duplicate_conv.at:72: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -rpath /foo -o libcee.la c.lo a/liba.la b/liba.la" +echo duplicate_conv.at:72 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -o libcee.la c.lo a/liba.la b/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -rpath /foo -o libcee.la c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:71: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:72" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/duplicate_conv.at:73: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT ./libcee.la" -echo duplicate_conv.at:73 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/duplicate_conv.at:74: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT ./libcee.la" +echo duplicate_conv.at:74 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT ./libcee.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:73: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:74" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/duplicate_conv.at:75: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/duplicate_conv.at:75: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo duplicate_conv.at:75 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:75: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:75" +$at_failed && at_func_log_failure $at_traceon @@ -3720,152 +3837,96 @@ $LIBTOOL --mode=clean rm -f libcee.la # Test whether this works with reloadable objects as well. $at_traceoff -echo "$at_srcdir/duplicate_conv.at:79: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o cee.\$OBJEXT c.lo a/liba.la b/liba.la" -echo duplicate_conv.at:79 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o cee.$OBJEXT c.lo a/liba.la b/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/duplicate_conv.at:80: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o cee.\$OBJEXT c.lo a/liba.la b/liba.la" +echo duplicate_conv.at:80 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o cee.$OBJEXT c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o cee.$OBJEXT c.lo a/liba.la b/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o cee.$OBJEXT c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o cee.$OBJEXT c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o cee.$OBJEXT c.lo a/liba.la b/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:79: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:80" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/duplicate_conv.at:81: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT cee.\$OBJEXT" -echo duplicate_conv.at:81 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT cee.$OBJEXT" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/duplicate_conv.at:82: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT cee.\$OBJEXT" +echo duplicate_conv.at:82 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT cee.$OBJEXT ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT cee.$OBJEXT"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT cee.$OBJEXT ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT cee.$OBJEXT ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT cee.$OBJEXT ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:81: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:82" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/duplicate_conv.at:83: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/duplicate_conv.at:83: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo duplicate_conv.at:83 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_conv.at:83: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_conv.at:83" +$at_failed && at_func_log_failure $at_traceon # TODO: test dlpreloading of duplicates (when it is implemented) - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 13 ) # 13. duplicate_deps.at:25: preserve duplicate convenience deps - at_setup_line='duplicate_deps.at:25' - at_desc="preserve duplicate convenience deps" - $at_quiet $ECHO_N " 13: preserve duplicate convenience deps $ECHO_C" - at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "13. duplicate_deps.at:25: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_12 +#AT_START_13 +# 13. duplicate_deps.at:25: preserve duplicate convenience deps +at_setup_line='duplicate_deps.at:25' +at_func_banner 2 +at_desc="preserve duplicate convenience deps" +$at_quiet $as_echo_n " 13: $at_desc " +at_xfail=yes +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "13. duplicate_deps.at:25: testing ..." + $at_traceon @@ -3900,89 +3961,57 @@ $LIBTOOL --mode=link --tag=CC $CC $CFLAG # libb.a as well, possibly renamed.) $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libb.la b1.lo liba.la $at_traceoff -echo "$at_srcdir/duplicate_deps.at:58: \$LIBTOOL --mode=link --tag=CC \\ +$as_echo "$at_srcdir/duplicate_deps.at:60: \$LIBTOOL --mode=link --tag=CC \\ \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT liba.la libb.la" -echo duplicate_deps.at:58 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo duplicate_deps.at:60 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC \ $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC \ + ( :; $LIBTOOL --mode=link --tag=CC \ $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_deps.at:58: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/duplicate_deps.at:60" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/duplicate_deps.at:61: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/duplicate_deps.at:61: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo duplicate_deps.at:61 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_deps.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/duplicate_deps.at:61" +$at_failed && at_func_log_failure $at_traceon @@ -3991,106 +4020,73 @@ $at_traceon $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libb.la b1.lo # Some systems find all symbols anyway; skip this test on such systems. $at_traceoff -echo "$at_srcdir/duplicate_deps.at:66: \$LIBTOOL --mode=link --tag=CC \\ +$as_echo "$at_srcdir/duplicate_deps.at:69: \$LIBTOOL --mode=link --tag=CC \\ \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT liba.la libb.la liba.la \\ && exit 77" -echo duplicate_deps.at:66 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo duplicate_deps.at:69 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC \ $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la libb.la liba.la \ && exit 77 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC \ + ( :; $LIBTOOL --mode=link --tag=CC \ $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la libb.la liba.la \ && exit 77 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/duplicate_deps.at:66: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/duplicate_deps.at:69" +$at_failed && at_func_log_failure $at_traceon # Other systems need special treatment, which currently fails. $at_traceoff -echo "$at_srcdir/duplicate_deps.at:72: \$LIBTOOL --mode=link --preserve-dup-deps --tag=CC \\ +$as_echo "$at_srcdir/duplicate_deps.at:74: \$LIBTOOL --mode=link --preserve-dup-deps --tag=CC \\ \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT liba.la libb.la liba.la" -echo duplicate_deps.at:72 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo duplicate_deps.at:74 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --preserve-dup-deps --tag=CC \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link --preserve-dup-deps --tag=CC \ $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la libb.la liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --preserve-dup-deps --tag=CC \ + ( :; $LIBTOOL --mode=link --preserve-dup-deps --tag=CC \ $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la libb.la liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/duplicate_deps.at:72: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/duplicate_deps.at:74" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 14 ) # 14. inherited_flags.at:26: inherited_linker_flags - at_setup_line='inherited_flags.at:26' - at_desc="inherited_linker_flags" - $at_quiet $ECHO_N " 14: inherited_linker_flags $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "14. inherited_flags.at:26: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_13 +#AT_START_14 +# 14. inherited_flags.at:26: inherited_linker_flags +at_setup_line='inherited_flags.at:26' +at_func_banner 2 +at_desc="inherited_linker_flags" +$at_quiet $as_echo_n " 14: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "14. inherited_flags.at:26: testing ..." + $at_traceon @@ -4147,42 +4143,23 @@ sed -e "s/^inherited_linker_flags.*/inhe rm libboth.la.bak $at_traceoff -echo "$at_srcdir/inherited_flags.at:76: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la" -echo inherited_flags.at:76 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/inherited_flags.at:77: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la" +echo inherited_flags.at:77 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - *);; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_skip $at_status "$at_srcdir/inherited_flags.at:77" +$at_failed && at_func_log_failure $at_traceon # We used to grep for @@ -4190,385 +4167,199 @@ $at_traceon # here. This fails on win32/MSVC because the generated command lines have a # different syntax. So drop the first `l'. $at_traceoff -echo "$at_srcdir/inherited_flags.at:82: \$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)" +$as_echo "$at_srcdir/inherited_flags.at:82: \$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)" echo inherited_flags.at:82 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --features | grep 'disable shared libraries' && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)"; then + ( $at_traceon; $LIBTOOL --features | grep 'disable shared libraries' && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --features | grep 'disable shared libraries' && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --features | grep 'disable shared libraries' && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/inherited_flags.at:82: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/inherited_flags.at:82" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:83: grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout" -echo inherited_flags.at:83 >"$at_check_line_file" +$as_echo "$at_srcdir/inherited_flags.at:84: grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout" +echo inherited_flags.at:84 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/inherited_flags.at:83: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/inherited_flags.at:84" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:85: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la" -echo inherited_flags.at:85 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/inherited_flags.at:86: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la" +echo inherited_flags.at:86 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - *);; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_skip $at_status "$at_srcdir/inherited_flags.at:86" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:87: grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout" -echo inherited_flags.at:87 >"$at_check_line_file" +$as_echo "$at_srcdir/inherited_flags.at:88: grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout" +echo inherited_flags.at:88 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'lt_[ui]nlikely_existing_lib.*lt_[ui]nlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/inherited_flags.at:87: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/inherited_flags.at:88" +$at_failed && at_func_log_failure $at_traceon # now check for duplicates $at_traceoff -echo "$at_srcdir/inherited_flags.at:91: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la" -echo inherited_flags.at:91 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/inherited_flags.at:92: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la" +echo inherited_flags.at:92 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - *);; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_skip $at_status "$at_srcdir/inherited_flags.at:92" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:93: grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout" -echo inherited_flags.at:93 >"$at_check_line_file" +$as_echo "$at_srcdir/inherited_flags.at:94: grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout" +echo inherited_flags.at:94 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/inherited_flags.at:93: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/inherited_flags.at:94" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:95: grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout" -echo inherited_flags.at:95 >"$at_check_line_file" +$as_echo "$at_srcdir/inherited_flags.at:96: grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout" +echo inherited_flags.at:96 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/inherited_flags.at:95: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 1 $at_status "$at_srcdir/inherited_flags.at:96" - - echo 1 > "$at_status_file" - exit 1 -fi - -$at_traceon +$at_failed && at_func_log_failure +$at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:97: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la" -echo inherited_flags.at:97 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/inherited_flags.at:98: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la" +echo inherited_flags.at:98 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - *);; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_skip $at_status "$at_srcdir/inherited_flags.at:98" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:99: grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout" -echo inherited_flags.at:99 >"$at_check_line_file" +$as_echo "$at_srcdir/inherited_flags.at:100: grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout" +echo inherited_flags.at:100 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/inherited_flags.at:99: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/inherited_flags.at:100" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:101: grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout" -echo inherited_flags.at:101 >"$at_check_line_file" +$as_echo "$at_srcdir/inherited_flags.at:102: grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout" +echo inherited_flags.at:102 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/inherited_flags.at:101: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/inherited_flags.at:102" +$at_failed && at_func_log_failure $at_traceon @@ -4577,136 +4368,80 @@ sed "s/^inherited_linker_flags.*/inherit rm libboth.la.bak $at_traceoff -echo "$at_srcdir/inherited_flags.at:108: \$LIBTOOL -n --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib" -echo inherited_flags.at:108 >"$at_check_line_file" +$as_echo "$at_srcdir/inherited_flags.at:109: \$LIBTOOL -n --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib" +echo inherited_flags.at:109 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib"; then + ( $at_traceon; $LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/inherited_flags.at:108: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/inherited_flags.at:109" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:110: grep Cocoa.ltframework stdout" +$as_echo "$at_srcdir/inherited_flags.at:110: grep Cocoa.ltframework stdout" echo inherited_flags.at:110 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep Cocoa.ltframework stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep Cocoa.ltframework stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep Cocoa.ltframework stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep Cocoa.ltframework stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/inherited_flags.at:110: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/inherited_flags.at:110" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/inherited_flags.at:111: grep ' -framework Cocoa' stdout" +$as_echo "$at_srcdir/inherited_flags.at:111: grep ' -framework Cocoa' stdout" echo inherited_flags.at:111 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep ' -framework Cocoa' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep ' -framework Cocoa' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep ' -framework Cocoa' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep ' -framework Cocoa' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/inherited_flags.at:111: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/inherited_flags.at:111" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 15 ) # 15. convenience.at:30: C convenience archives - at_setup_line='convenience.at:30' - at_desc="C convenience archives" - $at_quiet $ECHO_N " 15: C convenience archives $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "15. convenience.at:30: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_14 +#AT_START_15 +# 15. convenience.at:30: C convenience archives +at_setup_line='convenience.at:30' +at_func_banner 2 +at_desc="C convenience archives" +$at_quiet $as_echo_n " 15: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "15. convenience.at:30: testing ..." + $at_traceon @@ -4729,85 +4464,43 @@ for i in 1 2 3; do $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la a$i.lo done $at_traceoff -echo "$at_srcdir/convenience.at:51: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" -echo convenience.at:51 >"$at_check_line_file" +$as_echo "$at_srcdir/convenience.at:52: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" +echo convenience.at:52 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:51: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:52" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:53: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" -echo convenience.at:53 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:54: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" +echo convenience.at:54 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:53: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:54" +$at_failed && at_func_log_failure $at_traceon @@ -4815,279 +4508,166 @@ conv= for i in 1 2 3; do conv=$conv$i $at_traceoff -echo "$at_srcdir/convenience.at:59: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -static -o main_static main\$i.lo liba\$conv.la" -echo convenience.at:59 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:60: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -static -o main_static main\$i.lo liba\$conv.la" +echo convenience.at:60 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:59: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:60" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:61: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main\$i.lo liba\$conv.la" -echo convenience.at:61 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:62: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main\$i.lo liba\$conv.la" +echo convenience.at:62 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:62" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:63: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:63: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main_static\" || test -x \"./main_static\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo convenience.at:63 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:63: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:63" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:64: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:64: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo convenience.at:64 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:64: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:64" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 16 ) # 16. convenience.at:69: C++ convenience archives - at_setup_line='convenience.at:69' - at_desc="C++ convenience archives" - $at_quiet $ECHO_N " 16: C++ convenience archives $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "16. convenience.at:69: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_15 +#AT_START_16 +# 16. convenience.at:69: C++ convenience archives +at_setup_line='convenience.at:69' +at_func_banner 2 +at_desc="C++ convenience archives" +$at_quiet $as_echo_n " 16: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "16. convenience.at:69: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:70: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" +$as_echo "$at_srcdir/convenience.at:70: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" echo convenience.at:70 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)"; then + ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:70: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:70" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:70: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" +$as_echo "$at_srcdir/convenience.at:70: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" echo convenience.at:70 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)"; then + ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:70: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:70" +$at_failed && at_func_log_failure $at_traceon @@ -5112,85 +4692,43 @@ for i in 1 2 3; do $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba$i.la a$i.lo done $at_traceoff -echo "$at_srcdir/convenience.at:91: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" -echo convenience.at:91 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:92: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" +echo convenience.at:92 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:91: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:92" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:93: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" -echo convenience.at:93 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:94: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" +echo convenience.at:94 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:93: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:94" +$at_failed && at_func_log_failure $at_traceon @@ -5198,238 +4736,146 @@ conv= for i in 1 2 3; do conv=$conv$i $at_traceoff -echo "$at_srcdir/convenience.at:99: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -static -o main_static main\$i.lo liba\$conv.la" -echo convenience.at:99 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:100: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -static -o main_static main\$i.lo liba\$conv.la" +echo convenience.at:100 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:99: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:100" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:101: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o main main\$i.lo liba\$conv.la" -echo convenience.at:101 >"$at_check_line_file" +$as_echo "$at_srcdir/convenience.at:102: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o main main\$i.lo liba\$conv.la" +echo convenience.at:102 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o main main$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o main main$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:101: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:102" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:103: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:103: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main_static\" || test -x \"./main_static\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo convenience.at:103 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:103: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:103" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:104: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:104: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo convenience.at:104 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:104: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:104" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 17 ) # 17. convenience.at:109: F77 convenience archives - at_setup_line='convenience.at:109' - at_desc="F77 convenience archives" - $at_quiet $ECHO_N " 17: F77 convenience archives $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "17. convenience.at:109: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_16 +#AT_START_17 +# 17. convenience.at:109: F77 convenience archives +at_setup_line='convenience.at:109' +at_func_banner 2 +at_desc="F77 convenience archives" +$at_quiet $as_echo_n " 17: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "17. convenience.at:109: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:110: { test -n \"\$F77\" && test \"X\$F77\" != Xno; } || (exit 77)" +$as_echo "$at_srcdir/convenience.at:110: { test -n \"\$F77\" && test \"X\$F77\" != Xno; } || (exit 77)" echo convenience.at:110 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -n \"$F77\" && test \"X$F77\" != Xno; } || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -n "$F77" && test "X$F77" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -n "$F77" && test "X$F77" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -n \"$F77\" && test \"X$F77\" != Xno; } || (exit 77)"; then + ( $at_traceon; { test -n "$F77" && test "X$F77" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -n "$F77" && test "X$F77" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:110: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:110" +$at_failed && at_func_log_failure $at_traceon @@ -5475,85 +4921,43 @@ EOF $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba$i.la a$i.lo done $at_traceoff -echo "$at_srcdir/convenience.at:151: \$LIBTOOL --tag=F77 --mode=link \$F77 \$FFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" -echo convenience.at:151 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:152: \$LIBTOOL --tag=F77 --mode=link \$F77 \$FFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" +echo convenience.at:152 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:151: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:152" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:153: \$LIBTOOL --tag=F77 --mode=link \$F77 \$FFLAGS \$LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" -echo convenience.at:153 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:154: \$LIBTOOL --tag=F77 --mode=link \$F77 \$FFLAGS \$LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" +echo convenience.at:154 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:153: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:154" +$at_failed && at_func_log_failure $at_traceon @@ -5561,238 +4965,146 @@ conv= for i in 1 2 3; do conv=$conv$i $at_traceoff -echo "$at_srcdir/convenience.at:159: \$LIBTOOL --tag=F77 --mode=link \$F77 \$FFLAGS \$LDFLAGS -static -o main_static main\$i.lo liba\$conv.la" -echo convenience.at:159 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:160: \$LIBTOOL --tag=F77 --mode=link \$F77 \$FFLAGS \$LDFLAGS -static -o main_static main\$i.lo liba\$conv.la" +echo convenience.at:160 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:159: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:160" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:161: \$LIBTOOL --tag=F77 --mode=link \$F77 \$FFLAGS \$LDFLAGS -o main main\$i.lo liba\$conv.la" -echo convenience.at:161 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o main main$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:162: \$LIBTOOL --tag=F77 --mode=link \$F77 \$FFLAGS \$LDFLAGS -o main main\$i.lo liba\$conv.la" +echo convenience.at:162 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o main main$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=F77 --mode=link $F77 $FFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:161: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:162" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:163: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:163: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main_static\" || test -x \"./main_static\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo convenience.at:163 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:163: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:163" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:164: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:164: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo convenience.at:164 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:164: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:164" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 18 ) # 18. convenience.at:169: FC convenience archives - at_setup_line='convenience.at:169' - at_desc="FC convenience archives" - $at_quiet $ECHO_N " 18: FC convenience archives $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "18. convenience.at:169: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_17 +#AT_START_18 +# 18. convenience.at:169: FC convenience archives +at_setup_line='convenience.at:169' +at_func_banner 2 +at_desc="FC convenience archives" +$at_quiet $as_echo_n " 18: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "18. convenience.at:169: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:170: { test -n \"\$FC\" && test \"X\$FC\" != Xno; } || (exit 77)" +$as_echo "$at_srcdir/convenience.at:170: { test -n \"\$FC\" && test \"X\$FC\" != Xno; } || (exit 77)" echo convenience.at:170 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -n \"$FC\" && test \"X$FC\" != Xno; } || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -n "$FC" && test "X$FC" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -n "$FC" && test "X$FC" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -n \"$FC\" && test \"X$FC\" != Xno; } || (exit 77)"; then + ( $at_traceon; { test -n "$FC" && test "X$FC" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -n "$FC" && test "X$FC" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:170: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:170" +$at_failed && at_func_log_failure $at_traceon @@ -5838,85 +5150,43 @@ EOF $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba$i.la a$i.lo done $at_traceoff -echo "$at_srcdir/convenience.at:211: \$LIBTOOL --tag=FC --mode=link \$FC \$FCFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" -echo convenience.at:211 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:212: \$LIBTOOL --tag=FC --mode=link \$FC \$FCFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" +echo convenience.at:212 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:211: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:212" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:213: \$LIBTOOL --tag=FC --mode=link \$FC \$FCFLAGS \$LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" -echo convenience.at:213 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:214: \$LIBTOOL --tag=FC --mode=link \$FC \$FCFLAGS \$LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist" +echo convenience.at:214 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o liba123.la a3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:213: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:214" +$at_failed && at_func_log_failure $at_traceon @@ -5924,238 +5194,146 @@ conv= for i in 1 2 3; do conv=$conv$i $at_traceoff -echo "$at_srcdir/convenience.at:219: \$LIBTOOL --tag=FC --mode=link \$FC \$FCFLAGS \$LDFLAGS -static -o main_static main\$i.lo liba\$conv.la" -echo convenience.at:219 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:220: \$LIBTOOL --tag=FC --mode=link \$FC \$FCFLAGS \$LDFLAGS -static -o main_static main\$i.lo liba\$conv.la" +echo convenience.at:220 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -static -o main_static main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:219: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:220" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:221: \$LIBTOOL --tag=FC --mode=link \$FC \$FCFLAGS \$LDFLAGS -o main main\$i.lo liba\$conv.la" -echo convenience.at:221 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o main main$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:222: \$LIBTOOL --tag=FC --mode=link \$FC \$FCFLAGS \$LDFLAGS -o main main\$i.lo liba\$conv.la" +echo convenience.at:222 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o main main$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=FC --mode=link $FC $FCFLAGS $LDFLAGS -o main main$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:221: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:222" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:223: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:223: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main_static\" || test -x \"./main_static\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo convenience.at:223 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:223: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:223" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:224: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:224: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo convenience.at:224 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:224: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:224" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 19 ) # 19. convenience.at:229: Java convenience archives - at_setup_line='convenience.at:229' - at_desc="Java convenience archives" - $at_quiet $ECHO_N " 19: Java convenience archives $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "19. convenience.at:229: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_18 +#AT_START_19 +# 19. convenience.at:229: Java convenience archives +at_setup_line='convenience.at:229' +at_func_banner 2 +at_desc="Java convenience archives" +$at_quiet $as_echo_n " 19: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "19. convenience.at:229: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:230: { test -n \"\$GCJ\" && test \"X\$GCJ\" != Xno; } || (exit 77)" +$as_echo "$at_srcdir/convenience.at:230: { test -n \"\$GCJ\" && test \"X\$GCJ\" != Xno; } || (exit 77)" echo convenience.at:230 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -n \"$GCJ\" && test \"X$GCJ\" != Xno; } || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -n "$GCJ" && test "X$GCJ" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -n "$GCJ" && test "X$GCJ" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -n \"$GCJ\" && test \"X$GCJ\" != Xno; } || (exit 77)"; then + ( $at_traceon; { test -n "$GCJ" && test "X$GCJ" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -n "$GCJ" && test "X$GCJ" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:230: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:230" +$at_failed && at_func_log_failure $at_traceon @@ -6190,90 +5368,115 @@ public class A$i { public A$i () { a = 0; } }; EOF - $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c foo$i.java - $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c A$i.java - $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba$i.la A$i.lo -done -$at_traceoff -echo "$at_srcdir/convenience.at:265: \$LIBTOOL --tag=GCJ --mode=link \$GCJ \$GCJFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" + + # There are just too many broken gcj installations out there, either missing + # libgcj.spec or unable to find it. Skip this test for them. + if test $i -eq 1; then + $at_traceoff +$as_echo "$at_srcdir/convenience.at:265: \$GCJ \$GCJFLAGS -c foo1.java || exit 77" echo convenience.at:265 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac +if test -n "$at_traceon" \ + && at_func_check_newline "$GCJ $GCJFLAGS -c foo1.java || exit 77"; then + ( $at_traceon; $GCJ $GCJFLAGS -c foo1.java || exit 77 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $GCJ $GCJFLAGS -c foo1.java || exit 77 ) >"$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +echo stderr:; cat "$at_stderr" +echo stdout:; cat "$at_stdout" +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:265" + +$at_failed && at_func_log_failure +$at_traceon + + $at_traceoff +$as_echo "$at_srcdir/convenience.at:266: \$GCJ \$GCJFLAGS --main=foo1 -o foo1 foo1.java A1.java || exit 77" +echo convenience.at:266 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$GCJ $GCJFLAGS --main=foo1 -o foo1 foo1.java A1.java || exit 77"; then + ( $at_traceon; $GCJ $GCJFLAGS --main=foo1 -o foo1 foo1.java A1.java || exit 77 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $GCJ $GCJFLAGS --main=foo1 -o foo1 foo1.java A1.java || exit 77 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:265: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:266" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 + $at_traceoff +$as_echo "$at_srcdir/convenience.at:267: ./foo1\$EXEEXT || exit 77" +echo convenience.at:267 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "./foo1$EXEEXT || exit 77"; then + ( $at_traceon; ./foo1$EXEEXT || exit 77 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; ./foo1$EXEEXT || exit 77 ) >"$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +echo stderr:; cat "$at_stderr" +echo stdout:; cat "$at_stdout" +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:267" +$at_failed && at_func_log_failure $at_traceon -$at_traceoff -echo "$at_srcdir/convenience.at:267: \$LIBTOOL --tag=GCJ --mode=link \$GCJ \$GCJFLAGS \$LDFLAGS -o liba123.la A3.lo liba1.la liba2.la -rpath /notexist" -echo convenience.at:267 >"$at_check_line_file" + rm -f foo1.o foo1.obj foo1$EXEEXT + fi -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba123.la A3.lo liba1.la liba2.la -rpath /notexist" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi + $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c foo$i.java + $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c A$i.java + $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba$i.la A$i.lo +done +$at_traceoff +$as_echo "$at_srcdir/convenience.at:276: \$LIBTOOL --tag=GCJ --mode=link \$GCJ \$GCJFLAGS \$LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist" +echo convenience.at:276 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba123.la A3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba123.la A3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:267: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:276" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 +$at_traceoff +$as_echo "$at_srcdir/convenience.at:278: \$LIBTOOL --tag=GCJ --mode=link \$GCJ \$GCJFLAGS \$LDFLAGS -o liba123.la A3.lo liba1.la liba2.la -rpath /notexist" +echo convenience.at:278 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba123.la A3.lo liba1.la liba2.la -rpath /notexist"; then + ( $at_traceon; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba123.la A3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba123.la A3.lo liba1.la liba2.la -rpath /notexist ) >"$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +echo stderr:; cat "$at_stderr" +echo stdout:; cat "$at_stdout" +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:278" +$at_failed && at_func_log_failure $at_traceon @@ -6281,197 +5484,126 @@ conv= for i in 1 2 3; do conv=$conv$i $at_traceoff -echo "$at_srcdir/convenience.at:273: \$LIBTOOL --tag=GCJ --mode=link \$GCJ \$GCJFLAGS \$LDFLAGS -static --main=foo\$i -o main_static foo\$i.lo liba\$conv.la" -echo convenience.at:273 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -static --main=foo$i -o main_static foo$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:284: \$LIBTOOL --tag=GCJ --mode=link \$GCJ \$GCJFLAGS \$LDFLAGS -static --main=foo\$i -o main_static foo\$i.lo liba\$conv.la" +echo convenience.at:284 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -static --main=foo$i -o main_static foo$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -static --main=foo$i -o main_static foo$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -static --main=foo$i -o main_static foo$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -static --main=foo$i -o main_static foo$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -static --main=foo$i -o main_static foo$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:273: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:284" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/convenience.at:275: \$LIBTOOL --tag=GCJ --mode=link \$GCJ \$GCJFLAGS \$LDFLAGS --main=foo\$i -o main foo\$i.lo liba\$conv.la" -echo convenience.at:275 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS --main=foo$i -o main foo$i.lo liba$conv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/convenience.at:286: \$LIBTOOL --tag=GCJ --mode=link \$GCJ \$GCJFLAGS \$LDFLAGS --main=foo\$i -o main foo\$i.lo liba\$conv.la" +echo convenience.at:286 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS --main=foo$i -o main foo$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS --main=foo$i -o main foo$i.lo liba$conv.la"; then + ( $at_traceon; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS --main=foo$i -o main foo$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS --main=foo$i -o main foo$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS --main=foo$i -o main foo$i.lo liba$conv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:275: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:286" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:277: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:287: ./main_static; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main_static\" || test -x \"./main_static\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo convenience.at:277 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo convenience.at:287 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main_static; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main_static" || test -x "./main_static"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:277: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:287" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/convenience.at:278: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/convenience.at:288: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo convenience.at:278 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo convenience.at:288 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/convenience.at:278: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/convenience.at:288" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 20 ) # 20. link-order.at:26: Link order test. - at_setup_line='link-order.at:26' - at_desc="Link order test." - $at_quiet $ECHO_N " 20: Link order test. $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "20. link-order.at:26: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_19 +#AT_START_20 +# 20. link-order.at:26: Link order test. +at_setup_line='link-order.at:26' +at_func_banner 2 +at_desc="Link order test." +$at_quiet $as_echo_n " 20: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "20. link-order.at:26: testing ..." + $at_traceon eval `$LIBTOOL --config | $EGREP '^(hardcode_direct|hardcode_direct_absolute|shrext_cmds)='` @@ -6517,44 +5649,23 @@ EOF src/libb.la -L$prefix_old/lib -lcee -rpath $prefix/lib $LIBTOOL --mode=install cp src/libb.la $prefix/lib/libb.la $at_traceoff -echo "$at_srcdir/link-order.at:69: \$LIBTOOL --mode=install cp src/liba.la \$prefix/lib/liba.la" -echo link-order.at:69 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp src/liba.la $prefix/lib/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/link-order.at:70: \$LIBTOOL --mode=install cp src/liba.la \$prefix/lib/liba.la" +echo link-order.at:70 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp src/liba.la $prefix/lib/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp src/liba.la $prefix/lib/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=install cp src/liba.la $prefix/lib/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp src/liba.la $prefix/lib/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp src/liba.la $prefix/lib/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order.at:69: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/link-order.at:70" +$at_failed && at_func_log_failure $at_traceon done @@ -6569,91 +5680,63 @@ aix* | interix*) ;; # These systems hav case $hardcode_direct$hardcode_direct_absolute in yesno) $at_traceoff -echo "$at_srcdir/link-order.at:82: if \$EGREP relinking stderr; then +$as_echo "$at_srcdir/link-order.at:84: if \$EGREP relinking stderr; then \$EGREP \" .*\\/new\\/lib/libb\$shared_ext .*\\/old\\/lib/libcee\$shared_ext\" stdout else :; fi" -echo link-order.at:82 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo link-order.at:84 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; if $EGREP relinking stderr; then +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; if $EGREP relinking stderr; then $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; if $EGREP relinking stderr; then + ( :; if $EGREP relinking stderr; then $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order.at:82: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/link-order.at:84" if $at_failed; then echo "wrong link order" - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon ;; *) $at_traceoff -echo "$at_srcdir/link-order.at:87: if \$EGREP relinking stderr; then +$as_echo "$at_srcdir/link-order.at:89: if \$EGREP relinking stderr; then \$EGREP \" -L.*\\/new\\/lib -lb -L.*\\/old\\/lib -lcee\" stdout else :; fi" -echo link-order.at:87 >"$at_check_line_file" +echo link-order.at:89 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if $EGREP relinking stderr; then +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; if $EGREP relinking stderr; then $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; if $EGREP relinking stderr; then + ( :; if $EGREP relinking stderr; then $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order.at:87: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/link-order.at:89" if $at_failed; then echo "wrong link order" - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon ;; @@ -6670,110 +5753,75 @@ EOF prefix=`eval echo \\$prefix_$i` $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c src/main_$i.c -o src/main_$i.lo $at_traceoff -echo "$at_srcdir/link-order.at:103: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o src/main_\$i src/main_\$i.lo -L\$prefix/lib -la" -echo link-order.at:103 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/main_$i src/main_$i.lo -L$prefix/lib -la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/link-order.at:104: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o src/main_\$i src/main_\$i.lo -L\$prefix/lib -la" +echo link-order.at:104 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/main_$i src/main_$i.lo -L$prefix/lib -la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/main_$i src/main_$i.lo -L$prefix/lib -la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/main_$i src/main_$i.lo -L$prefix/lib -la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/main_$i src/main_$i.lo -L$prefix/lib -la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/main_$i src/main_$i.lo -L$prefix/lib -la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order.at:103: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/link-order.at:104" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/link-order.at:105: src/main_\$i; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/link-order.at:105: src/main_\$i; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"src/main_\$i\" || test -x \"src/main_\$i\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo link-order.at:105 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; src/main_$i; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; src/main_$i; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "src/main_$i" || test -x "src/main_$i"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; src/main_$i; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; src/main_$i; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "src/main_$i" || test -x "src/main_$i"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order.at:105: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/link-order.at:105" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 21 ) # 21. link-order2.at:46: Link order of deplibs. - at_setup_line='link-order2.at:46' - at_desc="Link order of deplibs." - $at_quiet $ECHO_N " 21: Link order of deplibs. $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "21. link-order2.at:46: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_20 +#AT_START_21 +# 21. link-order2.at:46: Link order of deplibs. +at_setup_line='link-order2.at:46' +at_func_banner 2 +at_desc="Link order of deplibs." +$at_quiet $as_echo_n " 21: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "21. link-order2.at:46: testing ..." + $at_traceon @@ -6851,180 +5899,108 @@ for type_of_depdepl in libtool non-libto $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o liba1.la a1.lo -rpath $libdir $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o libb.la b.lo liba1.la -rpath $libdir $at_traceoff -echo "$at_srcdir/link-order2.at:122: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$static -o main main.\$OBJEXT libb.la -la0" -echo link-order2.at:122 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o main main.$OBJEXT libb.la -la0" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/link-order2.at:123: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$static -o main main.\$OBJEXT libb.la -la0" +echo link-order2.at:123 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o main main.$OBJEXT libb.la -la0 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o main main.$OBJEXT libb.la -la0"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o main main.$OBJEXT libb.la -la0 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o main main.$OBJEXT libb.la -la0 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o main main.$OBJEXT libb.la -la0 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order2.at:122: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/link-order2.at:123" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/link-order2.at:124: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/link-order2.at:124: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo link-order2.at:124 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order2.at:124: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/link-order2.at:124" +$at_failed && at_func_log_failure $at_traceon # Now test that if we reverse the link order, the program fails. $at_traceoff -echo "$at_srcdir/link-order2.at:126: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$static -o wrong main.\$OBJEXT -la0 libb.la" -echo link-order2.at:126 >"$at_check_line_file" +$as_echo "$at_srcdir/link-order2.at:127: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$static -o wrong main.\$OBJEXT -la0 libb.la" +echo link-order2.at:127 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o wrong main.$OBJEXT -la0 libb.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o wrong main.$OBJEXT -la0 libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o wrong main.$OBJEXT -la0 libb.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o wrong main.$OBJEXT -la0 libb.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o wrong main.$OBJEXT -la0 libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o wrong main.$OBJEXT -la0 libb.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order2.at:126: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/link-order2.at:127" +$at_failed && at_func_log_failure $at_traceon if test $shared_fails,$static != yes,; then - $at_traceoff -echo "$at_srcdir/link-order2.at:129: ./wrong; lt_status=\$?; if test \$lt_status -eq 0; then :; + + +$at_traceoff +$as_echo "$at_srcdir/link-order2.at:129: ./wrong; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./wrong\" || test -x \"./wrong\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo link-order2.at:129 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./wrong; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./wrong; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./wrong" || test -x "./wrong"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./wrong; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./wrong; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./wrong" || test -x "./wrong"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 2) ;; - *) echo "$at_srcdir/link-order2.at:129: exit code was $at_status, expected 2" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 2 $at_status "$at_srcdir/link-order2.at:129" +$at_failed && at_func_log_failure $at_traceon @@ -7035,98 +6011,68 @@ $at_traceon $LIBTOOL --mode=install cp main $bindir/main $LIBTOOL --mode=install cp wrong $bindir/wrong $LIBTOOL --mode=clean rm -f liba1.la libb.la - $at_traceoff -echo "$at_srcdir/link-order2.at:137: \$bindir/main; lt_status=\$?; if test \$lt_status -eq 0; then :; + + +$at_traceoff +$as_echo "$at_srcdir/link-order2.at:137: \$bindir/main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"\$bindir/main\" || test -x \"\$bindir/main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo link-order2.at:137 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $bindir/main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $bindir/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/main" || test -x "$bindir/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $bindir/main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; $bindir/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/main" || test -x "$bindir/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order2.at:137: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/link-order2.at:137" +$at_failed && at_func_log_failure $at_traceon if test $shared_fails,$static != yes,; then - $at_traceoff -echo "$at_srcdir/link-order2.at:139: \$bindir/wrong; lt_status=\$?; if test \$lt_status -eq 0; then :; + + +$at_traceoff +$as_echo "$at_srcdir/link-order2.at:139: \$bindir/wrong; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"\$bindir/wrong\" || test -x \"\$bindir/wrong\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo link-order2.at:139 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $bindir/wrong; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $bindir/wrong; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/wrong" || test -x "$bindir/wrong"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $bindir/wrong; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; $bindir/wrong; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/wrong" || test -x "$bindir/wrong"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 2) ;; - *) echo "$at_srcdir/link-order2.at:139: exit code was $at_status, expected 2" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 2 $at_status "$at_srcdir/link-order2.at:139" +$at_failed && at_func_log_failure $at_traceon @@ -7135,65 +6081,45 @@ $at_traceon done $at_traceoff -echo "$at_srcdir/link-order2.at:144: test \$shared_fails = no || (exit 77)" +$as_echo "$at_srcdir/link-order2.at:144: test \$shared_fails = no || (exit 77)" echo link-order2.at:144 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test $shared_fails = no || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test $shared_fails = no || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test $shared_fails = no || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test $shared_fails = no || (exit 77)"; then + ( $at_traceon; test $shared_fails = no || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test $shared_fails = no || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/link-order2.at:144: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/link-order2.at:144" - - echo 1 > "$at_status_file" - exit 1 -fi - -$at_traceon +$at_failed && at_func_log_failure +$at_traceon # Now the converse: if both the program and the library need libm, then # it needs to be sorted last. (TODO) - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 22 ) # 22. fail.at:27: Failure tests - at_setup_line='fail.at:27' - at_desc="Failure tests" - $at_quiet $ECHO_N " 22: Failure tests $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "22. fail.at:27: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_21 +#AT_START_22 +# 22. fail.at:27: Failure tests +at_setup_line='fail.at:27' +at_func_banner 2 +at_desc="Failure tests" +$at_quiet $as_echo_n " 22: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "22. fail.at:27: testing ..." + $at_traceon eval `$LIBTOOL --config | $EGREP '^(pic_mode|pic_flag|build_old_libs|build_libtool_libs)='` @@ -7216,82 +6142,43 @@ fi # compile failure echo 'choke me' > a.c $at_traceoff -echo "$at_srcdir/fail.at:49: if \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c a.c; then (exit 1); else :; fi" +$as_echo "$at_srcdir/fail.at:49: if \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c a.c; then (exit 1); else :; fi" echo fail.at:49 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c; then (exit 1); else :; fi" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c; then (exit 1); else :; fi"; then + ( $at_traceon; if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/fail.at:49: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/fail.at:49" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/fail.at:50: test -f a.lo" +$as_echo "$at_srcdir/fail.at:50: test -f a.lo" echo fail.at:50 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f a.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f a.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f a.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f a.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/fail.at:50: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/fail.at:50" +$at_failed && at_func_log_failure $at_traceon @@ -7306,82 +6193,43 @@ case $pic_mode in default | yes) _ATEOF $at_traceoff -echo "$at_srcdir/fail.at:60: if \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -no-suppress -c a.c; then (exit 1); else :; fi" +$as_echo "$at_srcdir/fail.at:60: if \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -no-suppress -c a.c; then (exit 1); else :; fi" echo fail.at:60 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -no-suppress -c a.c; then (exit 1); else :; fi" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -no-suppress -c a.c; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -no-suppress -c a.c; then (exit 1); else :; fi"; then + ( $at_traceon; if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -no-suppress -c a.c; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -no-suppress -c a.c; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -no-suppress -c a.c; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/fail.at:60: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/fail.at:60" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/fail.at:61: test -f a.lo" +$as_echo "$at_srcdir/fail.at:61: test -f a.lo" echo fail.at:61 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f a.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f a.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f a.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f a.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/fail.at:61: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/fail.at:61" +$at_failed && at_func_log_failure $at_traceon ;; @@ -7393,169 +6241,85 @@ esac echo 'int not_main(void) { return 0; }' > a.c $CC $CPPFLAGS $CFLAGS -c a.c $at_traceoff -echo "$at_srcdir/fail.at:70: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o a a.\$OBJEXT; then (exit 1); else :; fi" +$as_echo "$at_srcdir/fail.at:70: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o a a.\$OBJEXT; then (exit 1); else :; fi" echo fail.at:70 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT; then (exit 1); else :; fi" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT; then (exit 1); else :; fi"; then + ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/fail.at:70: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/fail.at:70" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/fail.at:71: { test -f a && \$test_x a; } || { test -f a\$EXEEXT && \$test_x a\$EXEEXT; }" +$as_echo "$at_srcdir/fail.at:71: { test -f a && \$test_x a; } || { test -f a\$EXEEXT && \$test_x a\$EXEEXT; }" echo fail.at:71 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; }" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; } ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; } ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; }"; then + ( $at_traceon; { test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; } ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; } ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/fail.at:71: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/fail.at:71" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/fail.at:72: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o a a.\$OBJEXT -static; then (exit 1); else :; fi" +$as_echo "$at_srcdir/fail.at:72: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o a a.\$OBJEXT -static; then (exit 1); else :; fi" echo fail.at:72 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT -static; then (exit 1); else :; fi" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT -static; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT -static; then (exit 1); else :; fi"; then + ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT -static; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT -static; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a a.$OBJEXT -static; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/fail.at:72: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/fail.at:72" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/fail.at:73: { test -f a && \$test_x a; } || { test -f a\$EXEEXT && \$test_x a\$EXEEXT; }" +$as_echo "$at_srcdir/fail.at:73: { test -f a && \$test_x a; } || { test -f a\$EXEEXT && \$test_x a\$EXEEXT; }" echo fail.at:73 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; }" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; } ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; } ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; }"; then + ( $at_traceon; { test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; } ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -f a && $test_x a; } || { test -f a$EXEEXT && $test_x a$EXEEXT; } ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/fail.at:73: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/fail.at:73" +$at_failed && at_func_log_failure $at_traceon @@ -7575,103 +6339,65 @@ case $build_libtool_libs in yes) test "$non_pic_object" != none && echo choke me >"$non_pic_object" ) $at_traceoff -echo "$at_srcdir/fail.at:90: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo; then (exit 1); else :; fi" +$as_echo "$at_srcdir/fail.at:90: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo; then (exit 1); else :; fi" echo fail.at:90 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo; then (exit 1); else :; fi" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo; then (exit 1); else :; fi"; then + ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo b.lo c.lo -rpath /foo; then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/fail.at:90: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/fail.at:90" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/fail.at:91: test -f liba.la" +$as_echo "$at_srcdir/fail.at:91: test -f liba.la" echo fail.at:91 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/fail.at:91: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/fail.at:91" +$at_failed && at_func_log_failure $at_traceon ;; esac - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 23 ) # 23. shlibpath.at:25: shlibpath_overrides_runpath - at_setup_line='shlibpath.at:25' - at_desc="shlibpath_overrides_runpath" - $at_quiet $ECHO_N " 23: shlibpath_overrides_runpath $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "23. shlibpath.at:25: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_22 +#AT_START_23 +# 23. shlibpath.at:25: shlibpath_overrides_runpath +at_setup_line='shlibpath.at:25' +at_func_banner 2 +at_desc="shlibpath_overrides_runpath" +$at_quiet $as_echo_n " 23: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "23. shlibpath.at:25: testing ..." + $at_traceon @@ -7686,81 +6412,43 @@ rm -f sub/lib/liba.la $CC $CPPFLAGS $CFLAGS -c m.c $at_traceoff -echo "$at_srcdir/shlibpath.at:38: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m m.\$OBJEXT -Lsub/lib -la -R\`pwd\`/sub/lib" -echo shlibpath.at:38 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains a `...` command substitution)' -fi +$as_echo "$at_srcdir/shlibpath.at:39: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m m.\$OBJEXT -Lsub/lib -la -R\`pwd\`/sub/lib" +echo shlibpath.at:39 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT -Lsub/lib -la -R`pwd`/sub/lib ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if { echo 'Not enabling shell tracing (command contains a `...` command substitution)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT -Lsub/lib -la -R`pwd`/sub/lib ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT -Lsub/lib -la -R`pwd`/sub/lib ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT -Lsub/lib -la -R`pwd`/sub/lib ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/shlibpath.at:38: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/shlibpath.at:39" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/shlibpath.at:40: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m2 m.\$OBJEXT -Lsub/lib -la" -echo shlibpath.at:40 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT -Lsub/lib -la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/shlibpath.at:41: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m2 m.\$OBJEXT -Lsub/lib -la" +echo shlibpath.at:41 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT -Lsub/lib -la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT -Lsub/lib -la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT -Lsub/lib -la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT -Lsub/lib -la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT -Lsub/lib -la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/shlibpath.at:40: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/shlibpath.at:41" +$at_failed && at_func_log_failure $at_traceon @@ -7783,40 +6471,22 @@ eval `$LIBTOOL --config | $EGREP '^(shli # No point checking a system with static libraries: $at_traceoff -echo "$at_srcdir/shlibpath.at:54: { ./m || exit 1; } && exit 77" +$as_echo "$at_srcdir/shlibpath.at:54: { ./m || exit 1; } && exit 77" echo shlibpath.at:54 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { ./m || exit 1; } && exit 77 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; { ./m || exit 1; } && exit 77 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; { ./m || exit 1; } && exit 77 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; { ./m || exit 1; } && exit 77 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/shlibpath.at:54: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/shlibpath.at:54" +$at_failed && at_func_log_failure $at_traceon @@ -7830,156 +6500,109 @@ eval test -n \"\$$shlibpath_var\" && sep eval $shlibpath_var='$addpath$sep$'$shlibpath_var export $shlibpath_var if test "$shlibpath_overrides_runpath" != no; then - $at_traceoff -echo "$at_srcdir/shlibpath.at:66: ./m; lt_status=\$?; if test \$lt_status -eq 0; then :; + + +$at_traceoff +$as_echo "$at_srcdir/shlibpath.at:66: ./m; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./m\" || test -x \"./m\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo shlibpath.at:66 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./m; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./m; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m" || test -x "./m"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./m; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./m; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m" || test -x "./m"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/shlibpath.at:66: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/shlibpath.at:66" +$at_failed && at_func_log_failure $at_traceon else $at_traceoff -echo "$at_srcdir/shlibpath.at:68: ./m || exit 1" +$as_echo "$at_srcdir/shlibpath.at:68: ./m || exit 1" echo shlibpath.at:68 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./m || exit 1 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; ./m || exit 1 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; ./m || exit 1 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; ./m || exit 1 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/shlibpath.at:68: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/shlibpath.at:68" +$at_failed && at_func_log_failure $at_traceon fi # Test that shlibpath_var is effective in adding paths at all: + + $at_traceoff -echo "$at_srcdir/shlibpath.at:71: ./m2; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/shlibpath.at:71: ./m2; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./m2\" || test -x \"./m2\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo shlibpath.at:71 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m2" || test -x "./m2"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m2" || test -x "./m2"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/shlibpath.at:71: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/shlibpath.at:71" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 24 ) # 24. runpath-in-lalib.at:25: Runpath in libtool library files - at_setup_line='runpath-in-lalib.at:25' - at_desc="Runpath in libtool library files" - $at_quiet $ECHO_N " 24: Runpath in libtool library files $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "24. runpath-in-lalib.at:25: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_23 +#AT_START_24 +# 24. runpath-in-lalib.at:25: Runpath in libtool library files +at_setup_line='runpath-in-lalib.at:25' +at_func_banner 2 +at_desc="Runpath in libtool library files" +$at_quiet $as_echo_n " 24: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "24. runpath-in-lalib.at:25: testing ..." + $at_traceon @@ -8010,352 +6633,185 @@ for file in a.c b.c; do done $CC $CPPFLAGS $CFLAGS -c m.c $at_traceoff -echo "$at_srcdir/runpath-in-lalib.at:51: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba.la a.lo -rpath \$libdir -R\$addrunpath" -echo runpath-in-lalib.at:51 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir -R$addrunpath" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/runpath-in-lalib.at:52: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba.la a.lo -rpath \$libdir -R\$addrunpath" +echo runpath-in-lalib.at:52 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir -R$addrunpath ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir -R$addrunpath"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir -R$addrunpath ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir -R$addrunpath ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir -R$addrunpath ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/runpath-in-lalib.at:51: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/runpath-in-lalib.at:52" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/runpath-in-lalib.at:53: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o libb.la b.lo -rpath \$libdir liba.la" -echo runpath-in-lalib.at:53 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libb.la b.lo -rpath $libdir liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/runpath-in-lalib.at:54: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o libb.la b.lo -rpath \$libdir liba.la" +echo runpath-in-lalib.at:54 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libb.la b.lo -rpath $libdir liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libb.la b.lo -rpath $libdir liba.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libb.la b.lo -rpath $libdir liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libb.la b.lo -rpath $libdir liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libb.la b.lo -rpath $libdir liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/runpath-in-lalib.at:53: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/runpath-in-lalib.at:54" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/runpath-in-lalib.at:55: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m m.\$OBJEXT libb.la" -echo runpath-in-lalib.at:55 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT libb.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/runpath-in-lalib.at:56: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m m.\$OBJEXT libb.la" +echo runpath-in-lalib.at:56 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT libb.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT libb.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT libb.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/runpath-in-lalib.at:55: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/runpath-in-lalib.at:56" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/runpath-in-lalib.at:57: \$LIBTOOL --mode=install cp liba.la \$libdir/liba.la" +$as_echo "$at_srcdir/runpath-in-lalib.at:57: \$LIBTOOL --mode=install cp liba.la \$libdir/liba.la" echo runpath-in-lalib.at:57 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp liba.la $libdir/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp liba.la $libdir/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp liba.la $libdir/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=install cp liba.la $libdir/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp liba.la $libdir/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp liba.la $libdir/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/runpath-in-lalib.at:57: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/runpath-in-lalib.at:57" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/runpath-in-lalib.at:58: \$LIBTOOL --mode=install cp libb.la \$libdir/libb.la" +$as_echo "$at_srcdir/runpath-in-lalib.at:58: \$LIBTOOL --mode=install cp libb.la \$libdir/libb.la" echo runpath-in-lalib.at:58 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp libb.la $libdir/libb.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp libb.la $libdir/libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp libb.la $libdir/libb.la"; then + ( $at_traceon; $LIBTOOL --mode=install cp libb.la $libdir/libb.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp libb.la $libdir/libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp libb.la $libdir/libb.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/runpath-in-lalib.at:58: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/runpath-in-lalib.at:58" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/runpath-in-lalib.at:59: \$LIBTOOL --mode=install cp m \$bindir/m" +$as_echo "$at_srcdir/runpath-in-lalib.at:59: \$LIBTOOL --mode=install cp m \$bindir/m" echo runpath-in-lalib.at:59 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp m $bindir/m" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp m $bindir/m ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp m $bindir/m"; then + ( $at_traceon; $LIBTOOL --mode=install cp m $bindir/m ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp m $bindir/m ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp m $bindir/m ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/runpath-in-lalib.at:59: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/runpath-in-lalib.at:59" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/runpath-in-lalib.at:61: grep /foobar \$libdir/liba.la" +$as_echo "$at_srcdir/runpath-in-lalib.at:61: grep /foobar \$libdir/liba.la" echo runpath-in-lalib.at:61 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "grep /foobar $libdir/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep /foobar $libdir/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "grep /foobar $libdir/liba.la"; then + ( $at_traceon; grep /foobar $libdir/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep /foobar $libdir/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep /foobar $libdir/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/runpath-in-lalib.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/runpath-in-lalib.at:61" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/runpath-in-lalib.at:62: grep /foobar \$libdir/libb.la" +$as_echo "$at_srcdir/runpath-in-lalib.at:62: grep /foobar \$libdir/libb.la" echo runpath-in-lalib.at:62 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "grep /foobar $libdir/libb.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep /foobar $libdir/libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "grep /foobar $libdir/libb.la"; then + ( $at_traceon; grep /foobar $libdir/libb.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep /foobar $libdir/libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep /foobar $libdir/libb.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/runpath-in-lalib.at:62: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/runpath-in-lalib.at:62" +$at_failed && at_func_log_failure $at_traceon # TODO: check that m gets -R, too. - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 25 ) # 25. static.at:68: static linking flags for programs - at_setup_line='static.at:68' - at_desc="static linking flags for programs" - $at_quiet $ECHO_N " 25: static linking flags for programs $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "25. static.at:68: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_24 +#AT_START_25 +# 25. static.at:68: static linking flags for programs +at_setup_line='static.at:68' +at_func_banner 2 +at_desc="static linking flags for programs" +$at_quiet $as_echo_n " 25: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "25. static.at:68: testing ..." + $at_traceon @@ -8383,6 +6839,16 @@ eval `$LIBTOOL --config | if test -n "$per_deplib_static_flag" && test -n "$per_deplib_dynamic_flag"; then per_deplib=: fi +# On GNU/Linux with --disable-static, m-all-static fails to link. +# What we'd like to state here is: if the user actively passed +# --disable-static (as opposed to: the libtool.m4 macros set +# enable_static=no), then they cannot expect -all-static to work. +# So we punt, knowing that we mangle enable_static on AIX only. +can_link_all_static=-all-static +case $host_os,$have_static,$link_static_flag in + aix*) ;; + *,false,?*) can_link_all_static= ;; +esac # Create broken libraries. They will later be moved to those # directories where the respective libraries should be linked @@ -8511,100 +6977,70 @@ func_test_exec () for st do echo "# m$st" - $at_traceoff -echo "$at_srcdir/static.at:167: ./m\$st; lt_status=\$?; if test \$lt_status -eq 0; then :; + + +$at_traceoff +$as_echo "$at_srcdir/static.at:177: ./m\$st; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./m\$st\" || test -x \"./m\$st\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo static.at:167 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo static.at:177 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; ./m$st; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./m$st; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m$st" || test -x "./m$st"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./m$st; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./m$st; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m$st" || test -x "./m$st"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:167: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/static.at:177" +$at_failed && at_func_log_failure $at_traceon # For some per-deplib flag combinations there may be no installed program, # because liba2 is not yet installed. if test -f "$bindir/m$st"; then - $at_traceoff -echo "$at_srcdir/static.at:171: \$bindir/m\$st; lt_status=\$?; if test \$lt_status -eq 0; then :; + + +$at_traceoff +$as_echo "$at_srcdir/static.at:181: \$bindir/m\$st; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"\$bindir/m\$st\" || test -x \"\$bindir/m\$st\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo static.at:171 >"$at_check_line_file" +echo static.at:181 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $bindir/m$st; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $bindir/m$st; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/m$st" || test -x "$bindir/m$st"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $bindir/m$st; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; $bindir/m$st; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/m$st" || test -x "$bindir/m$st"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:171: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/static.at:181" +$at_failed && at_func_log_failure $at_traceon @@ -8623,100 +7059,70 @@ func_test_exec_fail () for st do echo "# m$st" - $at_traceoff -echo "$at_srcdir/static.at:187: ./m\$st || (exit 1); lt_status=\$?; if test \$lt_status -eq 0; then :; + + +$at_traceoff +$as_echo "$at_srcdir/static.at:197: ./m\$st || (exit 1); lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./m\$st || (exit 1)\" || test -x \"./m\$st || (exit 1)\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo static.at:187 >"$at_check_line_file" +echo static.at:197 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./m$st || (exit 1); lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./m$st || (exit 1); lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m$st || (exit 1)" || test -x "./m$st || (exit 1)"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./m$st || (exit 1); lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./m$st || (exit 1); lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m$st || (exit 1)" || test -x "./m$st || (exit 1)"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/static.at:187: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/static.at:197" +$at_failed && at_func_log_failure $at_traceon # For some per-deplib flag combinations there may be no installed program, # because liba2 is not yet installed. if test -f "$bindir/m$st"; then - $at_traceoff -echo "$at_srcdir/static.at:191: \$bindir/m\$st || (exit 1); lt_status=\$?; if test \$lt_status -eq 0; then :; + + +$at_traceoff +$as_echo "$at_srcdir/static.at:201: \$bindir/m\$st || (exit 1); lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"\$bindir/m\$st || (exit 1)\" || test -x \"\$bindir/m\$st || (exit 1)\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo static.at:191 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo static.at:201 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $bindir/m$st || (exit 1); lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $bindir/m$st || (exit 1); lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/m$st || (exit 1)" || test -x "$bindir/m$st || (exit 1)"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $bindir/m$st || (exit 1); lt_status=$?; if test $lt_status -eq 0; then :; + ( :; $bindir/m$st || (exit 1); lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/m$st || (exit 1)" || test -x "$bindir/m$st || (exit 1)"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/static.at:191: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/static.at:201" +$at_failed && at_func_log_failure $at_traceon @@ -8779,45 +7185,28 @@ for withdep in no yes; do $CC $CPPFLAGS $CFLAGS -c m.c # global static flags. - for st in -static -static-libtool-libs -all-static; do + for st in -static -static-libtool-libs $can_link_all_static; do $at_traceoff -echo "$at_srcdir/static.at:252: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$st -o m\$st m.\$OBJEXT \\ - -L\$libdir1 -la1 a2/liba2.la -L\$libdir3 -R\$libdir3 -la3" -echo static.at:252 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +$as_echo "$at_srcdir/static.at:264: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$st -o m\$st m.\$OBJEXT \\ + -L\$libdir1 -la1 a2/liba2.la -L\$libdir3 -R\$libdir3 -la3" +echo static.at:264 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m$st m.$OBJEXT \ - -L$libdir1 -la1 a2/liba2.la -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m$st m.$OBJEXT \ + -L$libdir1 -la1 a2/liba2.la -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m$st m.$OBJEXT \ - -L$libdir1 -la1 a2/liba2.la -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m$st m.$OBJEXT \ + -L$libdir1 -la1 a2/liba2.la -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:252: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:264" +$at_failed && at_func_log_failure $at_traceon done @@ -8826,464 +7215,269 @@ $at_traceon # also try a bit redundant flags, and shuffled order (for run paths check). if $per_deplib; then $at_traceoff -echo "$at_srcdir/static.at:260: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m1 m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:272: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m1 m.\$OBJEXT \\ -L\$libdir1 -Bstatic -la1 -Bdynamic a2/liba2.la -L\$libdir3 -R\$libdir3 -la3" -echo static.at:260 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo static.at:272 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m1 m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m1 m.$OBJEXT \ -L$libdir1 -Bstatic -la1 -Bdynamic a2/liba2.la -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m1 m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m1 m.$OBJEXT \ -L$libdir1 -Bstatic -la1 -Bdynamic a2/liba2.la -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:260: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:272" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/static.at:263: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m2 m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:275: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m2 m.\$OBJEXT \\ -L\$libdir1 -la1 -Bstatic a2/liba2.la -Bdynamic -L\$libdir3 -R\$libdir3 -la3" -echo static.at:263 >"$at_check_line_file" +echo static.at:275 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT \ -L$libdir1 -la1 -Bstatic a2/liba2.la -Bdynamic -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m2 m.$OBJEXT \ -L$libdir1 -la1 -Bstatic a2/liba2.la -Bdynamic -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:263: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:275" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/static.at:266: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m3 m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:278: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m3 m.\$OBJEXT \\ -L\$libdir1 -la1 a2/liba2.la -L\$libdir3 -Bstatic -la3 -Bdynamic" -echo static.at:266 >"$at_check_line_file" +echo static.at:278 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m3 m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m3 m.$OBJEXT \ -L$libdir1 -la1 a2/liba2.la -L$libdir3 -Bstatic -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m3 m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m3 m.$OBJEXT \ -L$libdir1 -la1 a2/liba2.la -L$libdir3 -Bstatic -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:266: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:278" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/static.at:269: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m12 m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:281: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m12 m.\$OBJEXT \\ -L\$libdir1 -Bstatic -la1 a2/liba2.la -Bdynamic -L\$libdir3 -R\$libdir3 -la3" -echo static.at:269 >"$at_check_line_file" +echo static.at:281 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m12 m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m12 m.$OBJEXT \ -L$libdir1 -Bstatic -la1 a2/liba2.la -Bdynamic -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m12 m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m12 m.$OBJEXT \ -L$libdir1 -Bstatic -la1 a2/liba2.la -Bdynamic -L$libdir3 -R$libdir3 -la3 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:269: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:281" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/static.at:272: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m13 m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:285: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m13 m.\$OBJEXT \\ -L\$libdir1 -Bstatic -la1 -Bdynamic a2/liba2.la \\ -L\$libdir3 -Bstatic -la3 -Bdynamic" -echo static.at:272 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo static.at:285 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m13 m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m13 m.$OBJEXT \ -L$libdir1 -Bstatic -la1 -Bdynamic a2/liba2.la \ -L$libdir3 -Bstatic -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m13 m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m13 m.$OBJEXT \ -L$libdir1 -Bstatic -la1 -Bdynamic a2/liba2.la \ -L$libdir3 -Bstatic -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:272: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:285" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/static.at:276: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m31 m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:289: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m31 m.\$OBJEXT \\ -L\$libdir3 -Bstatic -la3 -Bdynamic a2/liba2.la \\ -L\$libdir1 -Bstatic -la1 -Bdynamic" -echo static.at:276 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo static.at:289 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m31 m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m31 m.$OBJEXT \ -L$libdir3 -Bstatic -la3 -Bdynamic a2/liba2.la \ -L$libdir1 -Bstatic -la1 -Bdynamic ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m31 m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m31 m.$OBJEXT \ -L$libdir3 -Bstatic -la3 -Bdynamic a2/liba2.la \ -L$libdir1 -Bstatic -la1 -Bdynamic ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:276: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:289" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/static.at:280: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m23 m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:293: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m23 m.\$OBJEXT \\ -L\$libdir1 -la1 -Bstatic a2/liba2.la -Bdynamic \\ -L\$libdir3 -Bstatic -la3 -Bdynamic" -echo static.at:280 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo static.at:293 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m23 m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m23 m.$OBJEXT \ -L$libdir1 -la1 -Bstatic a2/liba2.la -Bdynamic \ -L$libdir3 -Bstatic -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m23 m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m23 m.$OBJEXT \ -L$libdir1 -la1 -Bstatic a2/liba2.la -Bdynamic \ -L$libdir3 -Bstatic -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:280: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:293" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/static.at:284: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m123 m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:296: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m123 m.\$OBJEXT \\ -L\$libdir1 -Bstatic -la1 a2/liba2.la -L\$libdir3 -la3 -Bdynamic" -echo static.at:284 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo static.at:296 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m123 m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m123 m.$OBJEXT \ -L$libdir1 -Bstatic -la1 a2/liba2.la -L$libdir3 -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m123 m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m123 m.$OBJEXT \ -L$libdir1 -Bstatic -la1 a2/liba2.la -L$libdir3 -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:284: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:296" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/static.at:287: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m123a m.\$OBJEXT \\ +$as_echo "$at_srcdir/static.at:300: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o m123a m.\$OBJEXT \\ -L\$libdir1 -Bstatic -la1 -Bdynamic -Bstatic a2/liba2.la -Bdynamic \\ -Bstatic -L\$libdir3 -la3 -Bdynamic" -echo static.at:287 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo static.at:300 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m123a m.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m123a m.$OBJEXT \ -L$libdir1 -Bstatic -la1 -Bdynamic -Bstatic a2/liba2.la -Bdynamic \ -Bstatic -L$libdir3 -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m123a m.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m123a m.$OBJEXT \ -L$libdir1 -Bstatic -la1 -Bdynamic -Bstatic a2/liba2.la -Bdynamic \ -Bstatic -L$libdir3 -la3 -Bdynamic ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:287: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:300" +$at_failed && at_func_log_failure $at_traceon fi ### install the programs. # We can't install any program that links dynamically against liba2. - for st in -static -static-libtool-libs -all-static `$per_deplib && echo 2 12 23 123 123a`; do + for st in -static -static-libtool-libs $can_link_all_static `$per_deplib && echo 2 12 23 123 123a`; do echo "# m$st" $at_traceoff -echo "$at_srcdir/static.at:301: \$LIBTOOL --mode=install cp m\$st \$bindir/m\$st" -echo static.at:301 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp m$st $bindir/m$st" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/static.at:311: \$LIBTOOL --mode=install cp m\$st \$bindir/m\$st" +echo static.at:311 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp m$st $bindir/m$st ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp m$st $bindir/m$st"; then + ( $at_traceon; $LIBTOOL --mode=install cp m$st $bindir/m$st ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp m$st $bindir/m$st ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp m$st $bindir/m$st ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/static.at:301: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/static.at:311" +$at_failed && at_func_log_failure $at_traceon if $have_static; then $at_traceoff -echo "$at_srcdir/static.at:303: \$EGREP 'relinking|has not been installed' stderr" -echo static.at:303 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$EGREP 'relinking|has not been installed' stderr" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/static.at:313: \$EGREP 'relinking|has not been installed' stderr" +echo static.at:313 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $EGREP 'relinking|has not been installed' stderr ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; $EGREP 'relinking|has not been installed' stderr ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "$EGREP 'relinking|has not been installed' stderr"; then + ( $at_traceon; $EGREP 'relinking|has not been installed' stderr ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $EGREP 'relinking|has not been installed' stderr ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/static.at:303: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/static.at:313" +$at_failed && at_func_log_failure $at_traceon fi @@ -9325,112 +7519,75 @@ $at_traceon cd .. done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 26 ) # 26. export.at:25: Export test - at_setup_line='export.at:25' - at_desc="Export test" - $at_quiet $ECHO_N " 26: Export test $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "26. export.at:25: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_25 +#AT_START_26 +# 26. export.at:25: Export test +at_setup_line='export.at:25' +at_func_banner 2 +at_desc="Export test" +$at_quiet $as_echo_n " 26: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "26. export.at:25: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/export.at:28: \$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)" -echo export.at:28 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/export.at:29: \$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)" +echo export.at:29 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --features | grep 'disable shared libraries' && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)"; then + ( $at_traceon; $LIBTOOL --features | grep 'disable shared libraries' && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --features | grep 'disable shared libraries' && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --features | grep 'disable shared libraries' && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/export.at:28: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/export.at:29" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/export.at:30: eval \`\$LIBTOOL --config | sed -n '/^archive_expsym_cmds=/,/^\$/p'\` +$as_echo "$at_srcdir/export.at:34: eval \`\$LIBTOOL --config | sed -n '/^archive_expsym_cmds=/,/^\$/p'\` test -n \"\$archive_expsym_cmds\" || echo false >can-hide case \$archive_expsym_cmds in *-retain-symbols-file*) echo false >can-hide ;; esac" -echo export.at:30 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains a `...` command substitution)' -fi +echo export.at:34 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; eval `$LIBTOOL --config | sed -n '/^archive_expsym_cmds=/,/^$/p'` +if { echo 'Not enabling shell tracing (command contains a `...` command substitution)' + false; }; then + ( $at_traceon; eval `$LIBTOOL --config | sed -n '/^archive_expsym_cmds=/,/^$/p'` test -n "$archive_expsym_cmds" || echo false >can-hide case $archive_expsym_cmds in *-retain-symbols-file*) echo false >can-hide ;; esac ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; eval `$LIBTOOL --config | sed -n '/^archive_expsym_cmds=/,/^$/p'` + ( :; eval `$LIBTOOL --config | sed -n '/^archive_expsym_cmds=/,/^$/p'` test -n "$archive_expsym_cmds" || echo false >can-hide case $archive_expsym_cmds in *-retain-symbols-file*) echo false >can-hide ;; esac ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:30: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/export.at:34" +$at_failed && at_func_log_failure $at_traceon can_hide=: @@ -9551,126 +7708,63 @@ _ATEOF $at_traceoff -echo "$at_srcdir/export.at:148: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c a.c" +$as_echo "$at_srcdir/export.at:148: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c a.c" echo export.at:148 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:148: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/export.at:148" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/export.at:149: \$CC \$CPPFLAGS -DLIBA_DLL_IMPORT \$CFLAGS -c main.c" +$as_echo "$at_srcdir/export.at:149: \$CC \$CPPFLAGS -DLIBA_DLL_IMPORT \$CFLAGS -c main.c" echo export.at:149 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c"; then + ( $at_traceon; $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:149: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/export.at:149" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/export.at:150: \$CC \$CPPFLAGS \$CFLAGS -c broken.c" +$as_echo "$at_srcdir/export.at:150: \$CC \$CPPFLAGS \$CFLAGS -c broken.c" echo export.at:150 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$CC $CPPFLAGS $CFLAGS -c broken.c" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $CC $CPPFLAGS $CFLAGS -c broken.c ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$CC $CPPFLAGS $CFLAGS -c broken.c"; then + ( $at_traceon; $CC $CPPFLAGS $CFLAGS -c broken.c ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $CC $CPPFLAGS $CFLAGS -c broken.c ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $CC $CPPFLAGS $CFLAGS -c broken.c ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:150: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/export.at:150" +$at_failed && at_func_log_failure $at_traceon @@ -9679,448 +7773,267 @@ do # case 1: shared library built from object. echo "eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo \\ -rpath $libdir' $exportsyms"; $at_traceoff -echo "$at_srcdir/export.at:155: eval '\$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba.la a.lo \\ +$as_echo "$at_srcdir/export.at:156: eval '\$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba.la a.lo \\ -rpath \$libdir' \$exportsyms" -echo export.at:155 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo export.at:156 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo \ -rpath $libdir' $exportsyms ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo \ + ( :; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo \ -rpath $libdir' $exportsyms ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:155: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/export.at:156" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/export.at:157: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT liba.la" -echo export.at:157 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/export.at:158: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT liba.la" +echo export.at:158 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:157: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/export.at:158" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/export.at:159: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/export.at:159: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo export.at:159 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:159: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/export.at:159" +$at_failed && at_func_log_failure $at_traceon if test -n "$exportsyms" && $can_hide; then $at_traceoff -echo "$at_srcdir/export.at:161: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o broken broken.\$OBJEXT liba.la +$as_echo "$at_srcdir/export.at:162: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o broken broken.\$OBJEXT liba.la then (exit 1); else :; fi" -echo export.at:161 >"$at_check_line_file" +echo export.at:162 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o broken broken.$OBJEXT liba.la +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o broken broken.$OBJEXT liba.la then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o broken broken.$OBJEXT liba.la + ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o broken broken.$OBJEXT liba.la then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:161: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/export.at:162" +$at_failed && at_func_log_failure $at_traceon fi # case 2: shared library built from convenience archive. $at_traceoff -echo "$at_srcdir/export.at:166: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o libconv.la a.lo" -echo export.at:166 >"$at_check_line_file" +$as_echo "$at_srcdir/export.at:167: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o libconv.la a.lo" +echo export.at:167 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libconv.la a.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libconv.la a.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libconv.la a.lo"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libconv.la a.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libconv.la a.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libconv.la a.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:166: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/export.at:167" +$at_failed && at_func_log_failure $at_traceon echo "eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la libconv.la \\ -rpath $libdir' $exportsyms"; $at_traceoff -echo "$at_srcdir/export.at:168: eval '\$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba.la libconv.la \\ +$as_echo "$at_srcdir/export.at:169: eval '\$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba.la libconv.la \\ -rpath \$libdir' \$exportsyms" -echo export.at:168 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo export.at:169 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la libconv.la \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la libconv.la \ -rpath $libdir' $exportsyms ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la libconv.la \ + ( :; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la libconv.la \ -rpath $libdir' $exportsyms ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:168: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/export.at:169" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/export.at:170: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT liba.la" -echo export.at:170 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/export.at:171: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT liba.la" +echo export.at:171 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:170: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/export.at:171" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/export.at:172: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/export.at:172: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo export.at:172 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:172: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/export.at:172" +$at_failed && at_func_log_failure $at_traceon if test -n "$exportsyms" && $can_hide; then $at_traceoff -echo "$at_srcdir/export.at:174: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o broken broken.\$OBJEXT liba.la +$as_echo "$at_srcdir/export.at:175: if \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o broken broken.\$OBJEXT liba.la then (exit 1); else :; fi" -echo export.at:174 >"$at_check_line_file" +echo export.at:175 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o broken broken.$OBJEXT liba.la +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o broken broken.$OBJEXT liba.la then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o broken broken.$OBJEXT liba.la + ( :; if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o broken broken.$OBJEXT liba.la then (exit 1); else :; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:174: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/export.at:175" +$at_failed && at_func_log_failure $at_traceon fi done $at_traceoff -echo "$at_srcdir/export.at:179: \$can_hide || (exit 77)" +$as_echo "$at_srcdir/export.at:179: \$can_hide || (exit 77)" echo export.at:179 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$can_hide || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $can_hide || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; $can_hide || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "$can_hide || (exit 77)"; then + ( $at_traceon; $can_hide || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $can_hide || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/export.at:179: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/export.at:179" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 27 ) # 27. search-path.at:25: sys_lib_search_path - at_setup_line='search-path.at:25' - at_desc="sys_lib_search_path" - $at_quiet $ECHO_N " 27: sys_lib_search_path $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "27. search-path.at:25: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_26 +#AT_START_27 +# 27. search-path.at:25: sys_lib_search_path +at_setup_line='search-path.at:25' +at_func_banner 2 +at_desc="sys_lib_search_path" +$at_quiet $as_echo_n " 27: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "27. search-path.at:25: testing ..." + $at_traceon LDFLAGS="$LDFLAGS -no-undefined" @@ -10145,65 +8058,45 @@ for path in $sys_lib_search_path; do if $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -L$path -lz then $at_traceoff -echo "$at_srcdir/search-path.at:47: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT -lz" -echo search-path.at:47 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -lz" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/search-path.at:48: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT -lz" +echo search-path.at:48 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -lz ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -lz"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -lz ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -lz ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -lz ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/search-path.at:47: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/search-path.at:48" +$at_failed && at_func_log_failure $at_traceon break fi done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 28 ) # 28. indirect_deps.at:25: indirect convenience - at_setup_line='indirect_deps.at:25' - at_desc="indirect convenience" - $at_quiet $ECHO_N " 28: indirect convenience $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "28. indirect_deps.at:25: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_27 +#AT_START_28 +# 28. indirect_deps.at:25: indirect convenience +at_setup_line='indirect_deps.at:25' +at_func_banner 2 +at_desc="indirect convenience" +$at_quiet $as_echo_n " 28: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "28. indirect_deps.at:25: testing ..." + $at_traceon @@ -10248,198 +8141,127 @@ $LIBTOOL --mode=link --tag=CC $CC $CFLAG for st in '' -static; do $at_traceoff -echo "$at_srcdir/indirect_deps.at:60: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS \$st -o m1 m.\$OBJEXT libd.la" -echo indirect_deps.at:60 >"$at_check_line_file" +$as_echo "$at_srcdir/indirect_deps.at:61: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS \$st -o m1 m.\$OBJEXT libd.la" +echo indirect_deps.at:61 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m.$OBJEXT libd.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m.$OBJEXT libd.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m.$OBJEXT libd.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m.$OBJEXT libd.la ) >"$at_stdout" 2>"$at_stderr" fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m.$OBJEXT libd.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m.$OBJEXT libd.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? -fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/indirect_deps.at:60: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/indirect_deps.at:61" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/indirect_deps.at:62: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS \$st -o m2 m.\$OBJEXT libconv.la" -echo indirect_deps.at:62 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m.$OBJEXT libconv.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/indirect_deps.at:63: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS \$st -o m2 m.\$OBJEXT libconv.la" +echo indirect_deps.at:63 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m.$OBJEXT libconv.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m.$OBJEXT libconv.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m.$OBJEXT libconv.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m.$OBJEXT libconv.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m.$OBJEXT libconv.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/indirect_deps.at:62: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/indirect_deps.at:63" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/indirect_deps.at:64: ./m1; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/indirect_deps.at:64: ./m1; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./m1\" || test -x \"./m1\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo indirect_deps.at:64 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./m1; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./m1; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m1" || test -x "./m1"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./m1; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./m1; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m1" || test -x "./m1"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/indirect_deps.at:64: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/indirect_deps.at:64" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/indirect_deps.at:65: ./m2; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/indirect_deps.at:65: ./m2; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./m2\" || test -x \"./m2\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo indirect_deps.at:65 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m2" || test -x "./m2"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m2" || test -x "./m2"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/indirect_deps.at:65: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/indirect_deps.at:65" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 29 ) # 29. indirect_deps.at:71: indirect uninstalled - at_setup_line='indirect_deps.at:71' - at_desc="indirect uninstalled" - $at_quiet $ECHO_N " 29: indirect uninstalled $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "29. indirect_deps.at:71: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_28 +#AT_START_29 +# 29. indirect_deps.at:71: indirect uninstalled +at_setup_line='indirect_deps.at:71' +at_func_banner 2 +at_desc="indirect uninstalled" +$at_quiet $as_echo_n " 29: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "29. indirect_deps.at:71: testing ..." + $at_traceon @@ -10489,199 +8311,128 @@ for st in '' -static; do $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o c/libcee.la c.lo b/libb.la -rpath /nowherec $at_traceoff -echo "$at_srcdir/indirect_deps.at:109: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS \$st -o m1 m1.\$OBJEXT b/libb.la" -echo indirect_deps.at:109 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m1.$OBJEXT b/libb.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/indirect_deps.at:110: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS \$st -o m1 m1.\$OBJEXT b/libb.la" +echo indirect_deps.at:110 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m1.$OBJEXT b/libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m1.$OBJEXT b/libb.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m1.$OBJEXT b/libb.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m1.$OBJEXT b/libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m1 m1.$OBJEXT b/libb.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/indirect_deps.at:109: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/indirect_deps.at:110" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/indirect_deps.at:111: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS \$st -o m2 m2.\$OBJEXT c/libcee.la" -echo indirect_deps.at:111 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m2.$OBJEXT c/libcee.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/indirect_deps.at:112: \$LIBTOOL --mode=link --tag=CC \$CC \$CFLAGS \$LDFLAGS \$st -o m2 m2.\$OBJEXT c/libcee.la" +echo indirect_deps.at:112 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m2.$OBJEXT c/libcee.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m2.$OBJEXT c/libcee.la"; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m2.$OBJEXT c/libcee.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m2.$OBJEXT c/libcee.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS $st -o m2 m2.$OBJEXT c/libcee.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/indirect_deps.at:111: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/indirect_deps.at:112" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/indirect_deps.at:113: ./m1; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/indirect_deps.at:113: ./m1; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./m1\" || test -x \"./m1\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo indirect_deps.at:113 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./m1; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./m1; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m1" || test -x "./m1"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./m1; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./m1; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m1" || test -x "./m1"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/indirect_deps.at:113: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/indirect_deps.at:113" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/indirect_deps.at:114: ./m2; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/indirect_deps.at:114: ./m2; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./m2\" || test -x \"./m2\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo indirect_deps.at:114 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m2" || test -x "./m2"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./m2; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./m2" || test -x "./m2"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/indirect_deps.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/indirect_deps.at:114" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 30 ) # 30. archive-in-archive.at:26: static library contains static library - at_setup_line='archive-in-archive.at:26' - at_desc="static library contains static library" - $at_quiet $ECHO_N " 30: static library contains static library $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_29 +#AT_START_30 +# 30. archive-in-archive.at:26: static library contains static library +at_setup_line='archive-in-archive.at:26' +at_func_banner 2 +at_desc="static library contains static library" +$at_quiet $as_echo_n " 30: $at_desc " +at_xfail=no case "$archive_contents" in *"libfoo.a"*) : ;; esac && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "30. archive-in-archive.at:26: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "30. archive-in-archive.at:26: testing ..." + $at_traceon @@ -10704,262 +8455,644 @@ $LIBTOOL --mode=link --tag=CC --tag=disa -o libfoo.la foo.lo -version-info 1:0:0 -rpath $thisdir $LIBTOOL --mode=install cp libfoo.la $thisdir $at_traceoff -echo "$at_srcdir/archive-in-archive.at:45: \$LIBTOOL --mode=link --tag=CC --tag=disable-shared \$CC \$CFLAGS \$LDFLAGS \\ +$as_echo "$at_srcdir/archive-in-archive.at:47: \$LIBTOOL --mode=link --tag=CC --tag=disable-shared \$CC \$CFLAGS \$LDFLAGS \\ -o libbar.la bar.lo ./libfoo.a -version-info 1:0:0 -rpath \$thisdir" -echo archive-in-archive.at:45 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo archive-in-archive.at:47 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \ -o libbar.la bar.lo ./libfoo.a -version-info 1:0:0 -rpath $thisdir ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \ + ( :; $LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \ -o libbar.la bar.lo ./libfoo.a -version-info 1:0:0 -rpath $thisdir ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/archive-in-archive.at:45: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/archive-in-archive.at:47" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/archive-in-archive.at:48: \$LIBTOOL --mode=install cp libbar.la \$thisdir" +$as_echo "$at_srcdir/archive-in-archive.at:48: \$LIBTOOL --mode=install cp libbar.la \$thisdir" echo archive-in-archive.at:48 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp libbar.la $thisdir" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp libbar.la $thisdir ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp libbar.la $thisdir"; then + ( $at_traceon; $LIBTOOL --mode=install cp libbar.la $thisdir ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp libbar.la $thisdir ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp libbar.la $thisdir ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/archive-in-archive.at:48: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/archive-in-archive.at:48" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/archive-in-archive.at:49: ar -t libbar.a | grep libfoo.a" +$as_echo "$at_srcdir/archive-in-archive.at:49: ar -t libbar.a | grep libfoo.a" echo archive-in-archive.at:49 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ar -t libbar.a | grep libfoo.a ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; ar -t libbar.a | grep libfoo.a ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; ar -t libbar.a | grep libfoo.a ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; ar -t libbar.a | grep libfoo.a ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/archive-in-archive.at:49: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/archive-in-archive.at:49" +$at_failed && at_func_log_failure $at_traceon archive_contents=`ar -t libbar.a` - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_30 +#AT_START_31 +# 31. execute-mode.at:25: execute mode +at_setup_line='execute-mode.at:25' +at_func_banner 2 +at_desc="execute mode" +$at_quiet $as_echo_n " 31: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "31. execute-mode.at:25: testing ..." + $at_traceon + + + +cat >foo <<'_ATEOF' +#! /bin/sh +if test $# -gt 0; then + echo "$@" +else + : +fi +_ATEOF - banner-3 ) # Banner 3. destdir.at:25 - cat <<\_ATEOF +cat >lt-wrapper <<'_ATEOF' +#! /bin/sh +# Generated by GNU libtool. +# fake wrapper script. +program=lt-real +progdir=. +if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + exec "$progdir/$program" ${1+"$@"} + echo "$0: cannot exec $program $*" >&2 + exit 1 +fi +_ATEOF -DESTDIR tests +cat >lt-real <<'_ATEOF' +#! /bin/sh +echo "$@" +cat _ATEOF - ;; - 31 ) # 31. destdir.at:48: Simple DESTDIR install - at_setup_line='destdir.at:48' - at_desc="Simple DESTDIR install" - $at_quiet $ECHO_N " 31: Simple DESTDIR install $ECHO_C" - at_xfail=no - eval `$LIBTOOL --config | grep '^fast_install='` - case $fast_install in no) :;; *) false;; esac && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "31. destdir.at:48: testing ..." - $at_traceon +cat >libfakelib.la <<'_ATEOF' +# libfakelib.la - a libtool library file +# Generated by ltmain.sh (GNU libtool 1.2605 2008/03/04 22:31:32) 2.3a +# +# Please DO NOT delete this file! +# It is necessary for linking the library. +dlname='' +library_names='' +old_library='libfakelib.a' +inherited_linker_flags='' +dependency_libs='' +weak_library_names='' +current= +age= +revision= +installed=no +shouldnotlink=yes +dlopen='' +dlpreopen='' +libdir='' +_ATEOF -# A program that depends upon a library, both in the same package. -# DESTDIR installs do not work with relink at install time. -LDFLAGS="$LDFLAGS -no-undefined" -if test -n "$we_are_on_a_safe_system"; then # let's read shorter cmdlines. - DESTDIR=/tmp/dest - prefix=/tmp/inst - rm -rf $DESTDIR $prefix +mkdir sub +cp foo sub/foo +chmod +x foo sub/foo lt-wrapper lt-real + +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:84: \$LIBTOOL --mode=execute ./foo" +echo execute-mode.at:84 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=execute ./foo"; then + ( $at_traceon; $LIBTOOL --mode=execute ./foo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - DESTDIR=`pwd`/dest - prefix=`pwd`/inst + ( :; $LIBTOOL --mode=execute ./foo ) >"$at_stdout" 2>"$at_stderr" fi -libdir=$prefix/lib -bindir=$prefix/bin -$mkdir_p src $prefix $DESTDIR $DESTDIR$prefix -eval `$LIBTOOL --config | $EGREP '^(FGREP|OBJDUMP)='` +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:84" + +$at_failed && at_func_log_failure +$at_traceon -cd src -echo 'int a() { return 0; }' > a.c -$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c -$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir -echo 'extern int a(); int main() { return a(); }' > m.c -$CC $CPPFLAGS $CFLAGS -c m.c -$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT liba.la -mkdir $DESTDIR$libdir $DESTDIR$bindir $at_traceoff -echo "$at_srcdir/destdir.at:61: \$LIBTOOL --mode=install cp liba.la \$DESTDIR\$libdir/liba.la" -echo destdir.at:61 >"$at_check_line_file" +$as_echo "$at_srcdir/execute-mode.at:85: \$LIBTOOL --mode=execute sub/foo" +echo execute-mode.at:85 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=execute sub/foo"; then + ( $at_traceon; $LIBTOOL --mode=execute sub/foo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=execute sub/foo ) >"$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:85" + +$at_failed && at_func_log_failure +$at_traceon -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:87: \$LIBTOOL --mode=execute ./foo foo" +echo execute-mode.at:87 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=execute ./foo foo"; then + ( $at_traceon; $LIBTOOL --mode=execute ./foo foo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=execute ./foo foo ) >"$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:87" + +$at_failed && at_func_log_failure +$at_traceon + +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:89: \$LIBTOOL --mode=execute ./lt-wrapper foo "$at_check_line_file" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=execute ./lt-wrapper foo "$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=execute ./lt-wrapper foo "$at_stdout" 2>"$at_stderr" +fi +at_status=$? at_failed=false -echo stderr:; cat "$at_stderr" -echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/destdir.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:89" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:91: cd sub && \$LIBTOOL --mode=execute ./foo ../foo" +echo execute-mode.at:91 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "cd sub && $LIBTOOL --mode=execute ./foo ../foo"; then + ( $at_traceon; cd sub && $LIBTOOL --mode=execute ./foo ../foo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; cd sub && $LIBTOOL --mode=execute ./foo ../foo ) >"$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "../foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:91" +$at_failed && at_func_log_failure $at_traceon +# suppose that ./foo is gdb, and lt-wrapper is the wrapper script. $at_traceoff -echo "$at_srcdir/destdir.at:63: \$LIBTOOL --mode=install cp m\$EXEEXT \$DESTDIR\$bindir/m\$EXEEXT" -echo destdir.at:63 >"$at_check_line_file" +$as_echo "$at_srcdir/execute-mode.at:95: \$LIBTOOL --mode=execute ./foo lt-wrapper bar baz "$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=execute ./foo lt-wrapper bar baz "$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=execute ./foo lt-wrapper bar baz "$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "./lt-real bar baz +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:95" + +$at_failed && at_func_log_failure +$at_traceon + -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +# check that stdin works even with -dlopen. +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:101: echo bar | \$LIBTOOL --mode=execute -dlopen libfakelib.la ./lt-wrapper foo" +echo execute-mode.at:101 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "echo bar | $LIBTOOL --mode=execute -dlopen libfakelib.la ./lt-wrapper foo"; then + ( $at_traceon; echo bar | $LIBTOOL --mode=execute -dlopen libfakelib.la ./lt-wrapper foo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; echo bar | $LIBTOOL --mode=execute -dlopen libfakelib.la ./lt-wrapper foo ) >"$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "foo +bar +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:101" + +$at_failed && at_func_log_failure +$at_traceon + + +# Check that a missing real program causes an error. +# The error message and code are likely to be 126, +# "No such file or directory" but system-dependent. +mv -f lt-real lt-backup +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:108: \$LIBTOOL --mode=execute ./lt-wrapper foo "$at_check_line_file" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=execute ./lt-wrapper foo "$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=execute ./lt-wrapper foo "$at_stdout" 2>"$at_stderr" +fi +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/destdir.at:63: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 1 $at_status "$at_srcdir/execute-mode.at:108" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi +mv -f lt-backup lt-real -$at_traceon +# Now use arguments that require decent quoting. +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:114: \$LIBTOOL --mode=execute ./foo \"arg with special chars: \\\$!&*\\\`'()\"" +echo execute-mode.at:114 >"$at_check_line_file" -$LIBTOOL --mode=clean rm -f liba.la m +if { echo 'Not enabling shell tracing (command contains a `...` command substitution)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=execute ./foo "arg with special chars: \$!&*\`'()" ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=execute ./foo "arg with special chars: \$!&*\`'()" ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "arg with special chars: \$!&*\`'() +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:114" + +$at_failed && at_func_log_failure +$at_traceon + +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:117: \$LIBTOOL --mode=execute ./lt-wrapper \"arg with special chars: \\\$!&*\\\`'()\" "$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains a `...` command substitution)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=execute ./lt-wrapper "arg with special chars: \$!&*\`'()" "$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=execute ./lt-wrapper "arg with special chars: \$!&*\`'()" "$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "arg with special chars: \$!&*\`'() +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:117" + +$at_failed && at_func_log_failure +$at_traceon + +$at_traceoff +$as_echo "$at_srcdir/execute-mode.at:120: \$LIBTOOL --mode=execute ./foo lt-wrapper \"arg with special chars: \\\$!&*\\\`'()\"" +echo execute-mode.at:120 >"$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains a `...` command substitution)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=execute ./foo lt-wrapper "arg with special chars: \$!&*\`'()" ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=execute ./foo lt-wrapper "arg with special chars: \$!&*\`'()" ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "./lt-real arg with special chars: \$!&*\`'() +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/execute-mode.at:120" + +$at_failed && at_func_log_failure +$at_traceon + + + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_31 +#AT_START_32 +# 32. localization.at:25: localized compiler messages +at_setup_line='localization.at:25' +at_func_banner 2 +at_desc="localized compiler messages" +$at_quiet $as_echo_n " 32: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "32. localization.at:25: testing ..." + $at_traceon + + + +# Let's try German locale. :-) +LANG=de_DE +LANGUAGE=de_DE +LC_ALL=de_DE +export LANG LANGUAGE LC_ALL + +cat >a.c <<'_ATEOF' +int x[-1]; +_ATEOF + +cat >b.c <<'_ATEOF' +int y; +_ATEOF + + +$at_traceoff +$as_echo "$at_srcdir/localization.at:41: \$CC \$CPPFLAGS \$CFLAGS -c a.c || exit 1" +echo localization.at:41 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "$CC $CPPFLAGS $CFLAGS -c a.c || exit 1"; then + ( $at_traceon; $CC $CPPFLAGS $CFLAGS -c a.c || exit 1 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $CC $CPPFLAGS $CFLAGS -c a.c || exit 1 ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_func_check_status 1 $at_status "$at_srcdir/localization.at:41" + +$at_failed && at_func_log_failure +$at_traceon + +mv -f stdout expected-stdout +mv -f stderr expected-stderr +$at_traceoff +$as_echo "$at_srcdir/localization.at:45: \$LIBTOOL --mode=compile --tag=CC \$CC \$CPPFLAGS \$CFLAGS -c a.c || exit 1" +echo localization.at:45 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || exit 1"; then + ( $at_traceon; $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || exit 1 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || exit 1 ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_func_check_status 1 $at_status "$at_srcdir/localization.at:45" + +$at_failed && at_func_log_failure +$at_traceon + +$at_traceoff +$as_echo "$at_srcdir/localization.at:46: diff expected-stderr stderr" +echo localization.at:46 >"$at_check_line_file" + +if test -n "$at_traceon"; then + ( $at_traceon; diff expected-stderr stderr ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; diff expected-stderr stderr ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/localization.at:46" + +$at_failed && at_func_log_failure +$at_traceon + +LTBASE=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'` +$at_traceoff +$as_echo "$at_srcdir/localization.at:48: grep -v \"^\$LTBASE: compile\" stdout | diff expected-stdout -" +echo localization.at:48 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "grep -v \"^$LTBASE: compile\" stdout | diff expected-stdout -"; then + ( $at_traceon; grep -v "^$LTBASE: compile" stdout | diff expected-stdout - ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; grep -v "^$LTBASE: compile" stdout | diff expected-stdout - ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/localization.at:48" + +$at_failed && at_func_log_failure +$at_traceon + + +# check that we get our quoting right. +LANGUAGE='a; nosuchprogram " '\'' & $x /#+*(){}|,:`\ !%' +export LANGUAGE +$at_traceoff +$as_echo "$at_srcdir/localization.at:54: \$LIBTOOL --mode=compile --tag=CC \$CC \$CPPFLAGS \$CFLAGS -c b.c" +echo localization.at:54 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c b.c"; then + ( $at_traceon; $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c b.c ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c b.c ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_func_check_status 0 $at_status "$at_srcdir/localization.at:54" + +$at_failed && at_func_log_failure +$at_traceon + +$at_traceoff +$as_echo "$at_srcdir/localization.at:55: grep nosuchprogram stdout stderr" +echo localization.at:55 >"$at_check_line_file" + +if test -n "$at_traceon"; then + ( $at_traceon; grep nosuchprogram stdout stderr ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; grep nosuchprogram stdout stderr ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/localization.at:55" + +$at_failed && at_func_log_failure +$at_traceon + + + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_32 +#AT_START_33 +# 33. destdir.at:48: Simple DESTDIR install +at_setup_line='destdir.at:48' +at_func_banner 3 +at_desc="Simple DESTDIR install" +$at_quiet $as_echo_n " 33: $at_desc " +at_xfail=no + eval `$LIBTOOL --config | grep '^fast_install='` + case $fast_install in no) :;; *) false;; esac && at_xfail=yes +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "33. destdir.at:48: testing ..." + $at_traceon + + + +# A program that depends upon a library, both in the same package. +# DESTDIR installs do not work with relink at install time. + +LDFLAGS="$LDFLAGS -no-undefined" +if test -n "$we_are_on_a_safe_system"; then # let's read shorter cmdlines. + DESTDIR=/tmp/dest + prefix=/tmp/inst + rm -rf $DESTDIR $prefix +else + DESTDIR=`pwd`/dest + prefix=`pwd`/inst +fi +libdir=$prefix/lib +bindir=$prefix/bin +$mkdir_p src $prefix $DESTDIR $DESTDIR$prefix +eval `$LIBTOOL --config | $EGREP '^(FGREP|OBJDUMP)='` + +cd src +echo 'int a() { return 0; }' > a.c +$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c +$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo -rpath $libdir +echo 'extern int a(); int main() { return a(); }' > m.c +$CC $CPPFLAGS $CFLAGS -c m.c +$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT liba.la +mkdir $DESTDIR$libdir $DESTDIR$bindir +$at_traceoff +$as_echo "$at_srcdir/destdir.at:62: \$LIBTOOL --mode=install cp liba.la \$DESTDIR\$libdir/liba.la" +echo destdir.at:62 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +echo stderr:; cat "$at_stderr" +echo stdout:; cat "$at_stdout" +at_func_check_status 0 $at_status "$at_srcdir/destdir.at:62" + +$at_failed && at_func_log_failure +$at_traceon + +$at_traceoff +$as_echo "$at_srcdir/destdir.at:64: \$LIBTOOL --mode=install cp m\$EXEEXT \$DESTDIR\$bindir/m\$EXEEXT" +echo destdir.at:64 >"$at_check_line_file" + +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT"; then + ( $at_traceon; $LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +echo stderr:; cat "$at_stderr" +echo stdout:; cat "$at_stdout" +at_func_check_status 0 $at_status "$at_srcdir/destdir.at:64" + +$at_failed && at_func_log_failure +$at_traceon + +$LIBTOOL --mode=clean rm -f liba.la m $mkdir_p "$libdir" (cd "$DESTDIR$libdir" && find . -type d) | (cd "$libdir" && xargs $mkdir_p) for file in `cd "$DESTDIR$libdir" && find . -type f -print -o -type l -print` @@ -10978,109 +9111,76 @@ rm -rf "$DESTDIR$bindir" # We ignore failure on purpose here: we may not be root. $at_traceoff -echo "$at_srcdir/destdir.at:69: \$LIBTOOL --mode=finish \$libdir" +$as_echo "$at_srcdir/destdir.at:69: \$LIBTOOL --mode=finish \$libdir" echo destdir.at:69 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=finish $libdir" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=finish $libdir ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=finish $libdir"; then + ( $at_traceon; $LIBTOOL --mode=finish $libdir ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=finish $libdir ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=finish $libdir ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - *);; -esac -if $at_failed; then +at_func_check_skip $at_status "$at_srcdir/destdir.at:69" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/destdir.at:70: \$bindir/m; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/destdir.at:70: \$bindir/m; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"\$bindir/m\" || test -x \"\$bindir/m\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo destdir.at:70 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $bindir/m; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $bindir/m; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/m" || test -x "$bindir/m"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $bindir/m; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; $bindir/m; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/m" || test -x "$bindir/m"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/destdir.at:70: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/destdir.at:70" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 32 ) # 32. destdir.at:75: DESTDIR with in-package deplibs - at_setup_line='destdir.at:75' - at_desc="DESTDIR with in-package deplibs" - $at_quiet $ECHO_N " 32: DESTDIR with in-package deplibs $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_33 +#AT_START_34 +# 34. destdir.at:75: DESTDIR with in-package deplibs +at_setup_line='destdir.at:75' +at_func_banner 3 +at_desc="DESTDIR with in-package deplibs" +$at_quiet $as_echo_n " 34: $at_desc " +at_xfail=no eval `$LIBTOOL --config | grep '^fast_install='` case $fast_install in no) :;; *) false;; esac && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "32. destdir.at:75: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "34. destdir.at:75: testing ..." + $at_traceon @@ -11118,163 +9218,83 @@ $CC $CPPFLAGS $CFLAGS -c m.c $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m m.$OBJEXT liba.la mkdir $DESTDIR$libdir $DESTDIR${libdir}2 $DESTDIR$bindir $at_traceoff -echo "$at_srcdir/destdir.at:96: \$LIBTOOL --mode=install cp liba1dep.la \$DESTDIR\$libdir/liba1dep.la" -echo destdir.at:96 >"$at_check_line_file" +$as_echo "$at_srcdir/destdir.at:97: \$LIBTOOL --mode=install cp liba1dep.la \$DESTDIR\$libdir/liba1dep.la" +echo destdir.at:97 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp liba1dep.la $DESTDIR$libdir/liba1dep.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp liba1dep.la $DESTDIR$libdir/liba1dep.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp liba1dep.la $DESTDIR$libdir/liba1dep.la"; then + ( $at_traceon; $LIBTOOL --mode=install cp liba1dep.la $DESTDIR$libdir/liba1dep.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp liba1dep.la $DESTDIR$libdir/liba1dep.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp liba1dep.la $DESTDIR$libdir/liba1dep.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/destdir.at:96: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/destdir.at:97" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/destdir.at:98: \$LIBTOOL --mode=install cp liba2dep.la \$DESTDIR\${libdir}2/liba2dep.la" -echo destdir.at:98 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains a ${...} parameter expansion)' -fi +$as_echo "$at_srcdir/destdir.at:99: \$LIBTOOL --mode=install cp liba2dep.la \$DESTDIR\${libdir}2/liba2dep.la" +echo destdir.at:99 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp liba2dep.la $DESTDIR${libdir}2/liba2dep.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if { echo 'Not enabling shell tracing (command contains a ${...} parameter expansion)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=install cp liba2dep.la $DESTDIR${libdir}2/liba2dep.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp liba2dep.la $DESTDIR${libdir}2/liba2dep.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp liba2dep.la $DESTDIR${libdir}2/liba2dep.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/destdir.at:98: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/destdir.at:99" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/destdir.at:100: \$LIBTOOL --mode=install cp liba.la \$DESTDIR\$libdir/liba.la" -echo destdir.at:100 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/destdir.at:101: \$LIBTOOL --mode=install cp liba.la \$DESTDIR\$libdir/liba.la" +echo destdir.at:101 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp liba.la $DESTDIR$libdir/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/destdir.at:100: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/destdir.at:101" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/destdir.at:102: \$LIBTOOL --mode=install cp m\$EXEEXT \$DESTDIR\$bindir/m\$EXEEXT" -echo destdir.at:102 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/destdir.at:103: \$LIBTOOL --mode=install cp m\$EXEEXT \$DESTDIR\$bindir/m\$EXEEXT" +echo destdir.at:103 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT"; then + ( $at_traceon; $LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=install cp m$EXEEXT $DESTDIR$bindir/m$EXEEXT ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/destdir.at:102: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/destdir.at:103" +$at_failed && at_func_log_failure $at_traceon $LIBTOOL --mode=clean rm -f liba1dep.la liba2dep.la liba.la m @@ -11304,38 +9324,23 @@ rm -rf "$DESTDIR$bindir" # We ignore failure on purpose here: we may not be root. $at_traceoff -echo "$at_srcdir/destdir.at:109: \$LIBTOOL --mode=finish \$libdir \${libdir}2" +$as_echo "$at_srcdir/destdir.at:109: \$LIBTOOL --mode=finish \$libdir \${libdir}2" echo destdir.at:109 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains a ${...} parameter expansion)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=finish $libdir ${libdir}2 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if { echo 'Not enabling shell tracing (command contains a ${...} parameter expansion)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=finish $libdir ${libdir}2 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=finish $libdir ${libdir}2 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=finish $libdir ${libdir}2 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - *);; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_skip $at_status "$at_srcdir/destdir.at:109" +$at_failed && at_func_log_failure $at_traceon @@ -11355,50 +9360,35 @@ for lib in a1dep a2dep a; do $LIBTOOL --mode=install cp lib$lib.la $DESTDIR$ldir/lib$lib.la done + + $at_traceoff -echo "$at_srcdir/destdir.at:127: \$bindir/m; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/destdir.at:127: \$bindir/m; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"\$bindir/m\" || test -x \"\$bindir/m\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo destdir.at:127 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $bindir/m; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $bindir/m; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/m" || test -x "$bindir/m"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $bindir/m; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; $bindir/m; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$bindir/m" || test -x "$bindir/m"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/destdir.at:127: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/destdir.at:127" +$at_failed && at_func_log_failure $at_traceon @@ -11406,44 +9396,23 @@ $at_traceon # TODO: make this more portable: if test "$OBJDUMP" != false && ($OBJDUMP -p $bindir/m$EXEEXT) >/dev/null 2>&1; then $at_traceoff -echo "$at_srcdir/destdir.at:131: \$OBJDUMP -p \$bindir/m\$EXEEXT | \$EGREP -i \"R(UN)?PATH.*\$DESTDIR\"" +$as_echo "$at_srcdir/destdir.at:131: \$OBJDUMP -p \$bindir/m\$EXEEXT | \$EGREP -i \"R(UN)?PATH.*\$DESTDIR\"" echo destdir.at:131 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$OBJDUMP -p $bindir/m$EXEEXT | $EGREP -i \"R(UN)?PATH.*$DESTDIR\"" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $OBJDUMP -p $bindir/m$EXEEXT | $EGREP -i "R(UN)?PATH.*$DESTDIR" ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; $OBJDUMP -p $bindir/m$EXEEXT | $EGREP -i "R(UN)?PATH.*$DESTDIR" ) >"$at_stdout" 2>"$at_stderr" - at_status=$? -fi - -at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/destdir.at:131: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 +if test -n "$at_traceon" \ + && at_func_check_newline "$OBJDUMP -p $bindir/m$EXEEXT | $EGREP -i \"R(UN)?PATH.*$DESTDIR\""; then + ( $at_traceon; $OBJDUMP -p $bindir/m$EXEEXT | $EGREP -i "R(UN)?PATH.*$DESTDIR" ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $OBJDUMP -p $bindir/m$EXEEXT | $EGREP -i "R(UN)?PATH.*$DESTDIR" ) >"$at_stdout" 2>"$at_stderr" fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/destdir.at:131" +$at_failed && at_func_log_failure $at_traceon . $libdir/liba.la @@ -11451,74 +9420,45 @@ $at_traceon lname=$2 if test -n "$lname"; then $at_traceoff -echo "$at_srcdir/destdir.at:136: \$OBJDUMP -p \$libdir/\$lname | \$EGREP -i \"R(UN)?PATH.*\$DESTDIR\"" +$as_echo "$at_srcdir/destdir.at:136: \$OBJDUMP -p \$libdir/\$lname | \$EGREP -i \"R(UN)?PATH.*\$DESTDIR\"" echo destdir.at:136 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$OBJDUMP -p $libdir/$lname | $EGREP -i \"R(UN)?PATH.*$DESTDIR\"" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $OBJDUMP -p $libdir/$lname | $EGREP -i "R(UN)?PATH.*$DESTDIR" ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; $OBJDUMP -p $libdir/$lname | $EGREP -i "R(UN)?PATH.*$DESTDIR" ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "$OBJDUMP -p $libdir/$lname | $EGREP -i \"R(UN)?PATH.*$DESTDIR\""; then + ( $at_traceon; $OBJDUMP -p $libdir/$lname | $EGREP -i "R(UN)?PATH.*$DESTDIR" ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $OBJDUMP -p $libdir/$lname | $EGREP -i "R(UN)?PATH.*$DESTDIR" ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/destdir.at:136: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/destdir.at:136" +$at_failed && at_func_log_failure $at_traceon fi fi - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-4 ) # Banner 4. old-m4-iface.at:26 - cat <<\_ATEOF - -Support for older m4 interface. - -_ATEOF - ;; - - 33 ) # 33. old-m4-iface.at:40: AM_PROG_LIBTOOL - at_setup_line='old-m4-iface.at:40' - at_desc="AM_PROG_LIBTOOL" - $at_quiet $ECHO_N " 33: AM_PROG_LIBTOOL $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_34 +#AT_START_35 +# 35. old-m4-iface.at:40: AM_PROG_LIBTOOL +at_setup_line='old-m4-iface.at:40' +at_func_banner 4 +at_desc="AM_PROG_LIBTOOL" +$at_quiet $as_echo_n " 35: $at_desc " +at_xfail=no test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "33. old-m4-iface.at:40: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "35. old-m4-iface.at:40: testing ..." + $at_traceon cat >configure.in <<'_ATEOF' @@ -11565,49 +9505,32 @@ $LIBTOOLIZE --install # This is slightly bogus, since only libtool.m4 was required in aclocal.m4 # with libtool-1.5x... $at_traceoff -echo "$at_srcdir/old-m4-iface.at:80: test -f aclocal.m4 || +$as_echo "$at_srcdir/old-m4-iface.at:83: test -f aclocal.m4 || cat \"\$tst_aclocaldir/libtool.m4\" \"\$tst_aclocaldir/ltoptions.m4\" \\ \"\$tst_aclocaldir/ltsugar.m4\" \"\$tst_aclocaldir/ltversion.m4\" \\ \"\$tst_aclocaldir/lt~obsolete.m4\" > aclocal.m4" -echo old-m4-iface.at:80 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo old-m4-iface.at:83 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; test -f aclocal.m4 || +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; test -f aclocal.m4 || cat "$tst_aclocaldir/libtool.m4" "$tst_aclocaldir/ltoptions.m4" \ "$tst_aclocaldir/ltsugar.m4" "$tst_aclocaldir/ltversion.m4" \ "$tst_aclocaldir/lt~obsolete.m4" > aclocal.m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; test -f aclocal.m4 || + ( :; test -f aclocal.m4 || cat "$tst_aclocaldir/libtool.m4" "$tst_aclocaldir/ltoptions.m4" \ "$tst_aclocaldir/ltsugar.m4" "$tst_aclocaldir/ltversion.m4" \ "$tst_aclocaldir/lt~obsolete.m4" > aclocal.m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:80: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:83" +$at_failed && at_func_log_failure $at_traceon @@ -11616,44 +9539,23 @@ $at_traceon $at_traceoff -echo "$at_srcdir/old-m4-iface.at:85: \$AUTOCONF --force" +$as_echo "$at_srcdir/old-m4-iface.at:85: \$AUTOCONF --force" echo old-m4-iface.at:85 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF --force" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF --force"; then + ( $at_traceon; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:85: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:85" +$at_failed && at_func_log_failure $at_traceon @@ -11661,137 +9563,81 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/old-m4-iface.at:85: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +$as_echo "$at_srcdir/old-m4-iface.at:85: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " echo old-m4-iface.at:85 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:85: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:85" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/old-m4-iface.at:85: \$MAKE " +$as_echo "$at_srcdir/old-m4-iface.at:85: \$MAKE " echo old-m4-iface.at:85 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE "; then + ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:85: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:85" +$at_failed && at_func_log_failure $at_traceon ) + + $at_traceoff -echo "$at_srcdir/old-m4-iface.at:87: ./old; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/old-m4-iface.at:87: ./old; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./old\" || test -x \"./old\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo old-m4-iface.at:87 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./old; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./old; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./old" || test -x "./old"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./old; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./old; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./old" || test -x "./old"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -echo >>"$at_stdout"; echo "Hello, World!" | $at_diff - "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:87: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "Hello, World!" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:87" +$at_failed && at_func_log_failure $at_traceon @@ -11801,213 +9647,121 @@ $at_traceon sed '/AM_PROG_LIBTOOL/d' configure.in >configure.int mv -f configure.int configure.in $at_traceoff -echo "$at_srcdir/old-m4-iface.at:93: \$LIBTOOLIZE -n" +$as_echo "$at_srcdir/old-m4-iface.at:93: \$LIBTOOLIZE -n" echo old-m4-iface.at:93 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOLIZE -n" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE -n ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOLIZE -n"; then + ( $at_traceon; $LIBTOOLIZE -n ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE -n ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOLIZE -n ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:93: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:93" +$at_failed && at_func_log_failure $at_traceon # ensure no shell errors: $at_traceoff -echo "$at_srcdir/old-m4-iface.at:95: grep -v \"^libtoolize: \" stderr" +$as_echo "$at_srcdir/old-m4-iface.at:95: grep -v \"^libtoolize: \" stderr" echo old-m4-iface.at:95 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep -v "^libtoolize: " stderr ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep -v "^libtoolize: " stderr ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep -v "^libtoolize: " stderr ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep -v "^libtoolize: " stderr ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/old-m4-iface.at:95: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/old-m4-iface.at:95" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/old-m4-iface.at:96: grep \"Remember to add.*LT_INIT.*to configure.in\" stdout" +$as_echo "$at_srcdir/old-m4-iface.at:96: grep \"Remember to add.*LT_INIT.*to configure.in\" stdout" echo old-m4-iface.at:96 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep "Remember to add.*LT_INIT.*to configure.in" stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep "Remember to add.*LT_INIT.*to configure.in" stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep "Remember to add.*LT_INIT.*to configure.in" stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep "Remember to add.*LT_INIT.*to configure.in" stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:96: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:96" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/old-m4-iface.at:97: grep \"Consider adding.*LT_WITH_LTDL\" stdout" +$as_echo "$at_srcdir/old-m4-iface.at:97: grep \"Consider adding.*LT_WITH_LTDL\" stdout" echo old-m4-iface.at:97 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep "Consider adding.*LT_WITH_LTDL" stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep "Consider adding.*LT_WITH_LTDL" stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep "Consider adding.*LT_WITH_LTDL" stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep "Consider adding.*LT_WITH_LTDL" stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/old-m4-iface.at:97: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/old-m4-iface.at:97" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/old-m4-iface.at:98: grep \"Remember to add.*LT_CONFIG_LTDL_DIR\" stdout" +$as_echo "$at_srcdir/old-m4-iface.at:98: grep \"Remember to add.*LT_CONFIG_LTDL_DIR\" stdout" echo old-m4-iface.at:98 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep "Remember to add.*LT_CONFIG_LTDL_DIR" stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep "Remember to add.*LT_CONFIG_LTDL_DIR" stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep "Remember to add.*LT_CONFIG_LTDL_DIR" stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep "Remember to add.*LT_CONFIG_LTDL_DIR" stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/old-m4-iface.at:98: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/old-m4-iface.at:98" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 34 ) # 34. old-m4-iface.at:107: AC_WITH_LTDL - at_setup_line='old-m4-iface.at:107' - at_desc="AC_WITH_LTDL" - $at_quiet $ECHO_N " 34: AC_WITH_LTDL $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_35 +#AT_START_36 +# 36. old-m4-iface.at:107: AC_WITH_LTDL +at_setup_line='old-m4-iface.at:107' +at_func_banner 4 +at_desc="AC_WITH_LTDL" +$at_quiet $as_echo_n " 36: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "34. old-m4-iface.at:107: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "36. old-m4-iface.at:107: testing ..." + $at_traceon cat >module.c <<'_ATEOF' @@ -12118,44 +9872,23 @@ $LIBTOOLIZE --ltdl --install $at_traceoff -echo "$at_srcdir/old-m4-iface.at:153: \$ACLOCAL -I libltdl/m4" -echo old-m4-iface.at:153 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I libltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/old-m4-iface.at:154: \$ACLOCAL -I libltdl/m4" +echo old-m4-iface.at:154 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I libltdl/m4"; then + ( $at_traceon; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:153: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:154" +$at_failed && at_func_log_failure $at_traceon @@ -12164,44 +9897,23 @@ $at_traceon $at_traceoff -echo "$at_srcdir/old-m4-iface.at:153: \$AUTOCONF --force" -echo old-m4-iface.at:153 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF --force" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/old-m4-iface.at:154: \$AUTOCONF --force" +echo old-m4-iface.at:154 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF --force"; then + ( $at_traceon; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:153: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:154" +$at_failed && at_func_log_failure $at_traceon @@ -12209,172 +9921,107 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/old-m4-iface.at:153: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " -echo old-m4-iface.at:153 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/old-m4-iface.at:154: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +echo old-m4-iface.at:154 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:153: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:154" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/old-m4-iface.at:153: \$MAKE " -echo old-m4-iface.at:153 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/old-m4-iface.at:154: \$MAKE " +echo old-m4-iface.at:154 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE "; then + ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:153: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:154" +$at_failed && at_func_log_failure $at_traceon ) + + $at_traceoff -echo "$at_srcdir/old-m4-iface.at:156: ./ltdldemo; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/old-m4-iface.at:156: ./ltdldemo; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./ltdldemo\" || test -x \"./ltdldemo\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo old-m4-iface.at:156 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./ltdldemo" || test -x "./ltdldemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./ltdldemo" || test -x "./ltdldemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/old-m4-iface.at:156: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/old-m4-iface.at:156" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-5 ) # Banner 5. am-subdir.at:26 - cat <<\_ATEOF - -Libtool subdir-objects support. - -_ATEOF - ;; - - 35 ) # 35. am-subdir.at:33: C subdir-objects - at_setup_line='am-subdir.at:33' - at_desc="C subdir-objects" - $at_quiet $ECHO_N " 35: C subdir-objects $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_36 +#AT_START_37 +# 37. am-subdir.at:33: C subdir-objects +at_setup_line='am-subdir.at:33' +at_func_banner 5 +at_desc="C subdir-objects" +$at_quiet $as_echo_n " 37: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "35. am-subdir.at:33: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "37. am-subdir.at:33: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subdir-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subdir-demo], 2.2.2, bug-libtool@gnu.org) AM_INIT_AUTOMAKE LT_INIT([win32-dll]) AC_PROG_CC @@ -12424,44 +10071,23 @@ $LIBTOOLIZE --copy $at_traceoff -echo "$at_srcdir/am-subdir.at:78: \$ACLOCAL -I m4" +$as_echo "$at_srcdir/am-subdir.at:78: \$ACLOCAL -I m4" echo am-subdir.at:78 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I m4"; then + ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:78: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:78" +$at_failed && at_func_log_failure $at_traceon @@ -12469,124 +10095,67 @@ $at_traceon $at_traceoff -echo "$at_srcdir/am-subdir.at:78: \$AUTOMAKE --add-missing" +$as_echo "$at_srcdir/am-subdir.at:78: \$AUTOMAKE --add-missing" echo am-subdir.at:78 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing"; then + ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:78: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:78" if $at_failed; then $at_traceoff -echo "$at_srcdir/am-subdir.at:78: grep 'require .*but have' stderr && (exit 77)" +$as_echo "$at_srcdir/am-subdir.at:78: grep 'require .*but have' stderr && (exit 77)" echo am-subdir.at:78 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/am-subdir.at:78: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/am-subdir.at:78" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/am-subdir.at:78: \$AUTOCONF " +$as_echo "$at_srcdir/am-subdir.at:78: \$AUTOCONF " echo am-subdir.at:78 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:78: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:78" +$at_failed && at_func_log_failure $at_traceon @@ -12594,339 +10163,193 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/am-subdir.at:78: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +$as_echo "$at_srcdir/am-subdir.at:78: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " echo am-subdir.at:78 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:78: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:78" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/am-subdir.at:78: \$MAKE " +$as_echo "$at_srcdir/am-subdir.at:78: \$MAKE " echo am-subdir.at:78 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE "; then + ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:78: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:78" +$at_failed && at_func_log_failure $at_traceon ) + + $at_traceoff -echo "$at_srcdir/am-subdir.at:80: subdir/subdemo; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/am-subdir.at:80: subdir/subdemo; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"subdir/subdemo\" || test -x \"subdir/subdemo\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo am-subdir.at:80 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; subdir/subdemo; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; subdir/subdemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "subdir/subdemo" || test -x "subdir/subdemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; subdir/subdemo; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; subdir/subdemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "subdir/subdemo" || test -x "subdir/subdemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:80: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:80" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/am-subdir.at:81: grep 'Welcome to GNU Libtool subdir-objects test' stdout" -echo am-subdir.at:81 >"$at_check_line_file" +$as_echo "$at_srcdir/am-subdir.at:82: grep 'Welcome to GNU Libtool subdir-objects test' stdout" +echo am-subdir.at:82 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'Welcome to GNU Libtool subdir-objects test' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'Welcome to GNU Libtool subdir-objects test' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'Welcome to GNU Libtool subdir-objects test' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'Welcome to GNU Libtool subdir-objects test' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:81: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:82" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/am-subdir.at:83: grep 'This is libsub' stdout" -echo am-subdir.at:83 >"$at_check_line_file" +$as_echo "$at_srcdir/am-subdir.at:84: grep 'This is libsub' stdout" +echo am-subdir.at:84 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'This is libsub' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'This is libsub' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'This is libsub' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'This is libsub' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:83: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:84" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 36 ) # 36. am-subdir.at:93: C++ subdir-objects - at_setup_line='am-subdir.at:93' - at_desc="C++ subdir-objects" - $at_quiet $ECHO_N " 36: C++ subdir-objects $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_37 +#AT_START_38 +# 38. am-subdir.at:93: C++ subdir-objects +at_setup_line='am-subdir.at:93' +at_func_banner 5 +at_desc="C++ subdir-objects" +$at_quiet $as_echo_n " 38: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "36. am-subdir.at:93: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "38. am-subdir.at:93: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/am-subdir.at:94: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" +$as_echo "$at_srcdir/am-subdir.at:94: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" echo am-subdir.at:94 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)"; then + ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:94: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:94" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/am-subdir.at:94: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" +$as_echo "$at_srcdir/am-subdir.at:94: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" echo am-subdir.at:94 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)"; then + ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:94: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:94" +$at_failed && at_func_log_failure $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subdir-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subdir-demo], 2.2.2, bug-libtool@gnu.org) AM_INIT_AUTOMAKE AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX AC_PROG_CXXCPP -# As of the writing of this demo, GNU Autoconf's AC_OBJEXT and -# AC_EXEEXT macros only works for C compilers! -# Libtool's setup macro calls AC_OBJEXT and AC_EXEEXT without setting -# the test language to C. We do it before any libtool setup macros are -# called so that the proper values are cached beforehand. We also do -# it before any linker flags (LDFLAGS) are set so that C++ specific -# ones don't break the tests. -AC_LANG_PUSH([C]) -AC_OBJEXT -AC_EXEEXT -AC_LANG_POP - AC_LANG([C++]) LT_INIT([win32-dll]) @@ -12978,44 +10401,23 @@ $LIBTOOLIZE --copy $at_traceoff -echo "$at_srcdir/am-subdir.at:158: \$ACLOCAL -I m4" -echo am-subdir.at:158 >"$at_check_line_file" +$as_echo "$at_srcdir/am-subdir.at:146: \$ACLOCAL -I m4" +echo am-subdir.at:146 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I m4"; then + ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:158: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:146" +$at_failed && at_func_log_failure $at_traceon @@ -13023,124 +10425,67 @@ $at_traceon $at_traceoff -echo "$at_srcdir/am-subdir.at:158: \$AUTOMAKE --add-missing" -echo am-subdir.at:158 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/am-subdir.at:146: \$AUTOMAKE --add-missing" +echo am-subdir.at:146 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing"; then + ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:158: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:146" if $at_failed; then $at_traceoff -echo "$at_srcdir/am-subdir.at:158: grep 'require .*but have' stderr && (exit 77)" -echo am-subdir.at:158 >"$at_check_line_file" +$as_echo "$at_srcdir/am-subdir.at:146: grep 'require .*but have' stderr && (exit 77)" +echo am-subdir.at:146 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/am-subdir.at:158: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/am-subdir.at:146" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/am-subdir.at:158: \$AUTOCONF " -echo am-subdir.at:158 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/am-subdir.at:146: \$AUTOCONF " +echo am-subdir.at:146 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:158: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:146" +$at_failed && at_func_log_failure $at_traceon @@ -13148,170 +10493,106 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/am-subdir.at:158: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " -echo am-subdir.at:158 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/am-subdir.at:146: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +echo am-subdir.at:146 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:158: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:146" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/am-subdir.at:158: \$MAKE " -echo am-subdir.at:158 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/am-subdir.at:146: \$MAKE " +echo am-subdir.at:146 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE "; then + ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:158: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:146" +$at_failed && at_func_log_failure $at_traceon ) + + $at_traceoff -echo "$at_srcdir/am-subdir.at:160: subdir/subdemo; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/am-subdir.at:148: subdir/subdemo; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"subdir/subdemo\" || test -x \"subdir/subdemo\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo am-subdir.at:160 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo am-subdir.at:148 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; subdir/subdemo; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; subdir/subdemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "subdir/subdemo" || test -x "subdir/subdemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; subdir/subdemo; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; subdir/subdemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "subdir/subdemo" || test -x "subdir/subdemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/am-subdir.at:160: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/am-subdir.at:148" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-6 ) # Banner 6. lt_dlexit.at:28 - cat <<\_ATEOF - -Libltdl functionality. - -_ATEOF - ;; - - 37 ) # 37. lt_dlexit.at:30: lt_dlexit unloading libs - at_setup_line='lt_dlexit.at:30' - at_desc="lt_dlexit unloading libs" - $at_quiet $ECHO_N " 37: lt_dlexit unloading libs $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "37. lt_dlexit.at:30: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_38 +#AT_START_39 +# 39. lt_dlexit.at:30: lt_dlexit unloading libs +at_setup_line='lt_dlexit.at:30' +at_func_banner 6 +at_desc="lt_dlexit unloading libs" +$at_quiet $as_echo_n " 39: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "39. lt_dlexit.at:30: testing ..." + $at_traceon # Test for # http://lists.gnu.org/archive/html/bug-libtool/2007-01/msg00014.html +# http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00013.html cat >main.c <<'_ATEOF' #include @@ -13360,6 +10641,14 @@ main (void) fprintf (stderr, "error during initialization: %s\n", lt_dlerror()); return 1; } + if (lt_dlexit() != 0) { + fprintf (stderr, "error during first lt_dlexit: %s\n", lt_dlerror()); + return 1; + } + if (lt_dlinit() != 0) { + fprintf (stderr, "error during second initialization: %s\n", lt_dlerror()); + return 1; + } if (!(b1 = xdlopen ("modb1.la"))) return 1; if (xdlsymtest (b1, "fb1", "vb1")) return 1; /* do not lt_dlclose here on purpose. */ @@ -13406,46 +10695,29 @@ _ATEOF # Skip this test when called from: # make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install $at_traceoff -echo "$at_srcdir/lt_dlexit.at:125: case \$LIBLTDL in #( +$as_echo "$at_srcdir/lt_dlexit.at:136: case \$LIBLTDL in #( */_inst/lib/*) test -f \$LIBLTDL || (exit 77) ;; esac" -echo lt_dlexit.at:125 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo lt_dlexit.at:136 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; case $LIBLTDL in #( +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; case $LIBLTDL in #( */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; esac ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; case $LIBLTDL in #( + ( :; case $LIBLTDL in #( */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; esac ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dlexit.at:125: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/lt_dlexit.at:136" +$at_failed && at_func_log_failure $at_traceon @@ -13457,195 +10729,130 @@ for file in a1 b1; do done $CC $CPPFLAGS $CFLAGS -c main.c $at_traceoff -echo "$at_srcdir/lt_dlexit.at:136: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba1.la a1.lo \\ +$as_echo "$at_srcdir/lt_dlexit.at:146: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba1.la a1.lo \\ -rpath /foo -avoid-version" -echo lt_dlexit.at:136 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo lt_dlexit.at:146 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba1.la a1.lo \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba1.la a1.lo \ -rpath /foo -avoid-version ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba1.la a1.lo \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba1.la a1.lo \ -rpath /foo -avoid-version ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dlexit.at:136: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/lt_dlexit.at:146" - - echo 1 > "$at_status_file" - exit 1 -fi - -$at_traceon +$at_failed && at_func_log_failure +$at_traceon $at_traceoff -echo "$at_srcdir/lt_dlexit.at:138: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o modb1.la b1.lo \\ +$as_echo "$at_srcdir/lt_dlexit.at:148: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o modb1.la b1.lo \\ -rpath /foo -module -avoid-version liba1.la" -echo lt_dlexit.at:138 >"$at_check_line_file" +echo lt_dlexit.at:148 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o modb1.la b1.lo \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o modb1.la b1.lo \ -rpath /foo -module -avoid-version liba1.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o modb1.la b1.lo \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o modb1.la b1.lo \ -rpath /foo -module -avoid-version liba1.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dlexit.at:138: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/lt_dlexit.at:148" +$at_failed && at_func_log_failure $at_traceon # TODO: test -dlpreopen for dlopen in -dlopen; do $at_traceoff -echo "$at_srcdir/lt_dlexit.at:143: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT \\ +$as_echo "$at_srcdir/lt_dlexit.at:153: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT \\ \$dlopen modb1.la \$LIBLTDL" -echo lt_dlexit.at:143 >"$at_check_line_file" +echo lt_dlexit.at:153 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \ $dlopen modb1.la $LIBLTDL ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \ + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \ $dlopen modb1.la $LIBLTDL ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dlexit.at:143: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/lt_dlexit.at:153" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/lt_dlexit.at:145: \$LIBTOOL --mode=execute -dlopen modb1.la ./main; lt_status=\$?; +$at_traceoff +$as_echo "$at_srcdir/lt_dlexit.at:154: \$LIBTOOL --mode=execute -dlopen modb1.la ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo lt_dlexit.at:145 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo lt_dlexit.at:154 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=execute -dlopen modb1.la ./main; lt_status=$?; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=execute -dlopen modb1.la ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=execute -dlopen modb1.la ./main; lt_status=$?; + ( :; $LIBTOOL --mode=execute -dlopen modb1.la ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dlexit.at:145: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/lt_dlexit.at:154" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 38 ) # 38. lt_dladvise.at:28: lt_dlopenadvise library loading - at_setup_line='lt_dladvise.at:28' - at_desc="lt_dlopenadvise library loading" - $at_quiet $ECHO_N " 38: lt_dlopenadvise library loading $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "38. lt_dladvise.at:28: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_39 +#AT_START_40 +# 40. lt_dladvise.at:28: lt_dlopenadvise library loading +at_setup_line='lt_dladvise.at:28' +at_func_banner 6 +at_desc="lt_dlopenadvise library loading" +$at_quiet $as_echo_n " 40: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "40. lt_dladvise.at:28: testing ..." + $at_traceon @@ -13794,8 +11001,9 @@ hint_global (void) printf ("global: %d\n", moduletest (handle, "f", "i")); /* Don't attempt to load moddepend unless modglobal was successfully - loaded and the symglobal hint was taken. */ - if (info && info->is_symglobal) + loaded and the symglobal hint was taken, and the system allows to + to have undefined symbols. */ + if (info && info->is_symglobal && HAVE_UNDEFINED_SYMBOLS) { hint_ext (); } @@ -13897,46 +11105,29 @@ _ATEOF # Skip this test when called from: # make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install $at_traceoff -echo "$at_srcdir/lt_dladvise.at:272: case \$LIBLTDL in #( +$as_echo "$at_srcdir/lt_dladvise.at:275: case \$LIBLTDL in #( */_inst/lib/*) test -f \$LIBLTDL || (exit 77) ;; esac" -echo lt_dladvise.at:272 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo lt_dladvise.at:275 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; case $LIBLTDL in #( +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; case $LIBLTDL in #( */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; esac ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; case $LIBLTDL in #( + ( :; case $LIBLTDL in #( */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; esac ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dladvise.at:272: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/lt_dladvise.at:275" +$at_failed && at_func_log_failure $at_traceon @@ -13952,50 +11143,35 @@ dlopenable='resident local global' # ------------------------------------------------------------------------- # case $host_os in -cygwin*) +cygwin* | mingw*) # These hosts do not support linking without -no-undefined + CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=0" ;; *) + CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=1" dlopenable="$dlopen depend" $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c moddepend.c $at_traceoff -echo "$at_srcdir/lt_dladvise.at:294: \$LIBTOOL --mode=link \$CC -module \$CFLAGS \$LDFLAGS -o libdepend.la \\ +$as_echo "$at_srcdir/lt_dladvise.at:298: \$LIBTOOL --mode=link \$CC -module \$CFLAGS \$LDFLAGS -o libdepend.la \\ moddepend.lo -rpath /foo -avoid-version" -echo lt_dladvise.at:294 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo lt_dladvise.at:298 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o libdepend.la \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o libdepend.la \ moddepend.lo -rpath /foo -avoid-version ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o libdepend.la \ + ( :; $LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o libdepend.la \ moddepend.lo -rpath /foo -avoid-version ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dladvise.at:294: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/lt_dladvise.at:298" +$at_failed && at_func_log_failure $at_traceon ;; @@ -14011,43 +11187,26 @@ $CC $CPPFLAGS $CFLAGS -c main.c for name in resident local global; do $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c mod$name.c $at_traceoff -echo "$at_srcdir/lt_dladvise.at:308: \$LIBTOOL --mode=link \$CC -module \$CFLAGS \$LDFLAGS -o lib\$name.la \\ +$as_echo "$at_srcdir/lt_dladvise.at:312: \$LIBTOOL --mode=link \$CC -module \$CFLAGS \$LDFLAGS -o lib\$name.la \\ mod\$name.lo -rpath /foo -avoid-version" -echo lt_dladvise.at:308 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo lt_dladvise.at:312 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o lib$name.la \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o lib$name.la \ mod$name.lo -rpath /foo -avoid-version ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o lib$name.la \ + ( :; $LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o lib$name.la \ mod$name.lo -rpath /foo -avoid-version ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dladvise.at:308: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/lt_dladvise.at:312" +$at_failed && at_func_log_failure $at_traceon done @@ -14061,112 +11220,81 @@ for dlopen in -dlopen; do done $at_traceoff -echo "$at_srcdir/lt_dladvise.at:320: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT \\ - \$modules \$LIBLTDL" -echo lt_dladvise.at:320 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +$as_echo "$at_srcdir/lt_dladvise.at:324: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT \$modules \$LIBLTDL" +echo lt_dladvise.at:324 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \ - $modules $LIBLTDL ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT $modules $LIBLTDL"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT $modules $LIBLTDL ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \ - $modules $LIBLTDL ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT $modules $LIBLTDL ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dladvise.at:320: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/lt_dladvise.at:324" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff -echo "$at_srcdir/lt_dladvise.at:322: \$LIBTOOL --mode=execute \$modules ./main; lt_status=\$?; + case $host_os in mingw*) + while read -r l; do printf "%s\r\n" "$l"; done < expout > expout.t + mv -f expout.t expout ;; +esac + +$at_traceoff +$as_echo "$at_srcdir/lt_dladvise.at:325: \$LIBTOOL --mode=execute \$modules ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo lt_dladvise.at:322 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo lt_dladvise.at:325 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=execute $modules ./main; lt_status=$?; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=execute $modules ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=execute $modules ./main; lt_status=$?; + ( :; $LIBTOOL --mode=execute $modules ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/lt_dladvise.at:322: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/lt_dladvise.at:325" +$at_failed && at_func_log_failure $at_traceon done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 39 ) # 39. need_lib_prefix.at:25: enforced lib prefix - at_setup_line='need_lib_prefix.at:25' - at_desc="enforced lib prefix" - $at_quiet $ECHO_N " 39: enforced lib prefix $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "39. need_lib_prefix.at:25: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_40 +#AT_START_41 +# 41. need_lib_prefix.at:25: enforced lib prefix +at_setup_line='need_lib_prefix.at:25' +at_func_banner 6 +at_desc="enforced lib prefix" +$at_quiet $as_echo_n " 41: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "41. need_lib_prefix.at:25: testing ..." + $at_traceon @@ -14291,46 +11419,29 @@ _ATEOF # Skip this test when called from: # make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install $at_traceoff -echo "$at_srcdir/need_lib_prefix.at:144: case \$LIBLTDL in #( +$as_echo "$at_srcdir/need_lib_prefix.at:146: case \$LIBLTDL in #( */_inst/lib/*) test -f \$LIBLTDL || (exit 77) ;; esac" -echo need_lib_prefix.at:144 >"$at_check_line_file" +echo need_lib_prefix.at:146 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; case $LIBLTDL in #( +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; case $LIBLTDL in #( */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; esac ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; case $LIBLTDL in #( + ( :; case $LIBLTDL in #( */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; esac ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/need_lib_prefix.at:144: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/need_lib_prefix.at:146" +$at_failed && at_func_log_failure $at_traceon @@ -14350,176 +11461,101 @@ for file in foo1 foo2; do done $at_traceoff -echo "$at_srcdir/need_lib_prefix.at:163: \$LIBTOOL --mode=link \$CC -module -avoid-version \$CFLAGS \$LDFLAGS -o foo1.la foo1.lo -rpath \$instdir/lib" -echo need_lib_prefix.at:163 >"$at_check_line_file" +$as_echo "$at_srcdir/need_lib_prefix.at:164: \$LIBTOOL --mode=link \$CC -module -avoid-version \$CFLAGS \$LDFLAGS -o foo1.la foo1.lo -rpath \$instdir/lib" +echo need_lib_prefix.at:164 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o foo1.la foo1.lo -rpath $instdir/lib" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o foo1.la foo1.lo -rpath $instdir/lib ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o foo1.la foo1.lo -rpath $instdir/lib"; then + ( $at_traceon; $LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o foo1.la foo1.lo -rpath $instdir/lib ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o foo1.la foo1.lo -rpath $instdir/lib ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o foo1.la foo1.lo -rpath $instdir/lib ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/need_lib_prefix.at:163: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/need_lib_prefix.at:164" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/need_lib_prefix.at:165: \$LIBTOOL --mode=link \$CC -module -avoid-version \$CFLAGS \$LDFLAGS -o libfoo2.la foo2.lo -rpath \$instdir/lib" -echo need_lib_prefix.at:165 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o libfoo2.la foo2.lo -rpath $instdir/lib" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/need_lib_prefix.at:166: \$LIBTOOL --mode=link \$CC -module -avoid-version \$CFLAGS \$LDFLAGS -o libfoo2.la foo2.lo -rpath \$instdir/lib" +echo need_lib_prefix.at:166 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o libfoo2.la foo2.lo -rpath $instdir/lib ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o libfoo2.la foo2.lo -rpath $instdir/lib"; then + ( $at_traceon; $LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o libfoo2.la foo2.lo -rpath $instdir/lib ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o libfoo2.la foo2.lo -rpath $instdir/lib ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC -module -avoid-version $CFLAGS $LDFLAGS -o libfoo2.la foo2.lo -rpath $instdir/lib ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/need_lib_prefix.at:165: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/need_lib_prefix.at:166" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/need_lib_prefix.at:167: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT -dlpreopen foo1.la -dlpreopen libfoo2.la \$LIBLTDL" -echo need_lib_prefix.at:167 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -dlpreopen foo1.la -dlpreopen libfoo2.la $LIBLTDL" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/need_lib_prefix.at:168: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o main main.\$OBJEXT -dlpreopen foo1.la -dlpreopen libfoo2.la \$LIBLTDL" +echo need_lib_prefix.at:168 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -dlpreopen foo1.la -dlpreopen libfoo2.la $LIBLTDL ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -dlpreopen foo1.la -dlpreopen libfoo2.la $LIBLTDL"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -dlpreopen foo1.la -dlpreopen libfoo2.la $LIBLTDL ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -dlpreopen foo1.la -dlpreopen libfoo2.la $LIBLTDL ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT -dlpreopen foo1.la -dlpreopen libfoo2.la $LIBLTDL ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/need_lib_prefix.at:167: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/need_lib_prefix.at:168" +$at_failed && at_func_log_failure $at_traceon +case $host_os in mingw*) + while read -r l; do printf "%s\r\n" "$l"; done < expout > expout.t + mv -f expout.t expout ;; +esac + $at_traceoff -echo "$at_srcdir/need_lib_prefix.at:170: \$LIBTOOL --mode=execute -dlopen foo1.la -dlopen libfoo2.la ./main; lt_status=\$?; +$as_echo "$at_srcdir/need_lib_prefix.at:171: \$LIBTOOL --mode=execute -dlopen foo1.la -dlopen libfoo2.la ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" -echo need_lib_prefix.at:170 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo need_lib_prefix.at:171 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=execute -dlopen foo1.la -dlopen libfoo2.la ./main; lt_status=$?; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=execute -dlopen foo1.la -dlopen libfoo2.la ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=execute -dlopen foo1.la -dlopen libfoo2.la ./main; lt_status=$?; + ( :; $LIBTOOL --mode=execute -dlopen foo1.la -dlopen libfoo2.la ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/need_lib_prefix.at:170: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/need_lib_prefix.at:171" +$at_failed && at_func_log_failure $at_traceon @@ -14534,686 +11570,411 @@ $LIBTOOL --mode=install cp libfoo2.la $i mkdir $instdir/bin $LIBTOOL --mode=install cp main $instdir/bin/main +case $host_os in mingw*) + while read -r l; do printf "%s\r\n" "$l"; done < expout > expout.t + mv -f expout.t expout ;; +esac + $at_traceoff -echo "$at_srcdir/need_lib_prefix.at:183: \$instdir/bin/main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/need_lib_prefix.at:183: \$instdir/bin/main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"\$instdir/bin/main\" || test -x \"\$instdir/bin/main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo need_lib_prefix.at:183 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $instdir/bin/main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $instdir/bin/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$instdir/bin/main" || test -x "$instdir/bin/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $instdir/bin/main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; $instdir/bin/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$instdir/bin/main" || test -x "$instdir/bin/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/need_lib_prefix.at:183: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/need_lib_prefix.at:183" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-7 ) # Banner 7. standalone.at:25 - cat <<\_ATEOF - -Standalone Libltdl. - -_ATEOF - ;; - - 40 ) # 40. standalone.at:31: compiling softlinked libltdl - at_setup_line='standalone.at:31' - at_desc="compiling softlinked libltdl" - $at_quiet $ECHO_N " 40: compiling softlinked libltdl $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "40. standalone.at:31: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_41 +#AT_START_42 +# 42. standalone.at:31: compiling softlinked libltdl +at_setup_line='standalone.at:31' +at_func_banner 7 +at_desc="compiling softlinked libltdl" +$at_quiet $as_echo_n " 42: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "42. standalone.at:31: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/standalone.at:33: $LIBTOOLIZE --ltdl=. +$as_echo "$at_srcdir/standalone.at:33: $LIBTOOLIZE --ltdl=. " echo standalone.at:33 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --ltdl=. + ( $at_traceon; $LIBTOOLIZE --ltdl=. ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --ltdl=. + ( :; $LIBTOOLIZE --ltdl=. ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:33: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:33" +$at_failed && at_func_log_failure $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/standalone.at:34: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +$as_echo "$at_srcdir/standalone.at:34: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " echo standalone.at:34 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:34: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:34" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/standalone.at:35: \$MAKE all \$tst_dist " +$as_echo "$at_srcdir/standalone.at:35: \$MAKE all \$tst_dist " echo standalone.at:35 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all $tst_dist "; then + ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:35: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:35" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/standalone.at:37: test -f libltdlc.la" +$as_echo "$at_srcdir/standalone.at:37: test -f libltdlc.la" echo standalone.at:37 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:37: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:37" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - - - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 41 ) # 41. standalone.at:46: compiling copied libltdl - at_setup_line='standalone.at:46' - at_desc="compiling copied libltdl" - $at_quiet $ECHO_N " 41: compiling copied libltdl $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "41. standalone.at:46: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_42 +#AT_START_43 +# 43. standalone.at:46: compiling copied libltdl +at_setup_line='standalone.at:46' +at_func_banner 7 +at_desc="compiling copied libltdl" +$at_quiet $as_echo_n " 43: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "43. standalone.at:46: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/standalone.at:48: $LIBTOOLIZE --copy --ltdl=. +$as_echo "$at_srcdir/standalone.at:48: $LIBTOOLIZE --copy --ltdl=. " echo standalone.at:48 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --ltdl=. + ( $at_traceon; $LIBTOOLIZE --copy --ltdl=. ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --ltdl=. + ( :; $LIBTOOLIZE --copy --ltdl=. ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:48: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:48" +$at_failed && at_func_log_failure $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/standalone.at:49: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +$as_echo "$at_srcdir/standalone.at:49: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " echo standalone.at:49 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:49: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:49" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/standalone.at:50: \$MAKE all \$tst_dist " +$as_echo "$at_srcdir/standalone.at:50: \$MAKE all \$tst_dist " echo standalone.at:50 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all $tst_dist "; then + ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:50: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:50" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/standalone.at:52: test -f libltdlc.la" +$as_echo "$at_srcdir/standalone.at:52: test -f libltdlc.la" echo standalone.at:52 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:52: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:52" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 42 ) # 42. standalone.at:61: installable libltdl - at_setup_line='standalone.at:61' - at_desc="installable libltdl" - $at_quiet $ECHO_N " 42: installable libltdl $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "42. standalone.at:61: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_43 +#AT_START_44 +# 44. standalone.at:61: installable libltdl +at_setup_line='standalone.at:61' +at_func_banner 7 +at_desc="installable libltdl" +$at_quiet $as_echo_n " 44: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "44. standalone.at:61: testing ..." + $at_traceon prefix=`pwd`/_inst $at_traceoff -echo "$at_srcdir/standalone.at:65: $LIBTOOLIZE --copy --ltdl=. +$as_echo "$at_srcdir/standalone.at:65: $LIBTOOLIZE --copy --ltdl=. " echo standalone.at:65 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --ltdl=. + ( $at_traceon; $LIBTOOLIZE --copy --ltdl=. ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --ltdl=. + ( :; $LIBTOOLIZE --copy --ltdl=. ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:65: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:65" +$at_failed && at_func_log_failure $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/standalone.at:66: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" +$as_echo "$at_srcdir/standalone.at:66: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" echo standalone.at:66 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix"; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:66: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:66" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/standalone.at:67: \$MAKE all install \$tst_dist " +$as_echo "$at_srcdir/standalone.at:67: \$MAKE all install \$tst_dist " echo standalone.at:67 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all install $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all install $tst_dist "; then + ( $at_traceon; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:67: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:67" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/standalone.at:69: test -f \$prefix/lib/libltdl.la" +$as_echo "$at_srcdir/standalone.at:69: test -f \$prefix/lib/libltdl.la" echo standalone.at:69 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/lib/libltdl.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/lib/libltdl.la"; then + ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:69: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:69" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/standalone.at:70: test -f \$prefix/include/ltdl.h" +$as_echo "$at_srcdir/standalone.at:70: test -f \$prefix/include/ltdl.h" echo standalone.at:70 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/include/ltdl.h" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/include/ltdl.h"; then + ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:70: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:70" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 43 ) # 43. standalone.at:79: linking libltdl without autotools - at_setup_line='standalone.at:79' - at_desc="linking libltdl without autotools" - $at_quiet $ECHO_N " 43: linking libltdl without autotools $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "43. standalone.at:79: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_44 +#AT_START_45 +# 45. standalone.at:79: linking libltdl without autotools +at_setup_line='standalone.at:79' +at_func_banner 7 +at_desc="linking libltdl without autotools" +$at_quiet $as_echo_n " 45: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "45. standalone.at:79: testing ..." + $at_traceon cat >module.c <<'_ATEOF' @@ -15316,174 +12077,116 @@ EOF $at_traceoff -echo "$at_srcdir/standalone.at:82: $LIBTOOLIZE --copy --ltdl +$as_echo "$at_srcdir/standalone.at:82: $LIBTOOLIZE --copy --ltdl " echo standalone.at:82 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOLIZE --copy --ltdl + ( $at_traceon; $LIBTOOLIZE --copy --ltdl ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOLIZE --copy --ltdl + ( :; $LIBTOOLIZE --copy --ltdl ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:82: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:82" +$at_failed && at_func_log_failure $at_traceon ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/standalone.at:83: \$MAKE CC=\"\$CC\" LIBTOOLFLAGS=\"\$LIBTOOLFLAGS\" CPPFLAGS=\"\$CPPFLAGS\" \\ +$as_echo "$at_srcdir/standalone.at:85: \$MAKE CC=\"\$CC\" LIBTOOLFLAGS=\"\$LIBTOOLFLAGS\" CPPFLAGS=\"\$CPPFLAGS\" \\ CFLAGS=\"\$CFLAGS\" LDFLAGS=\"\$LDFLAGS\" \\ CONFIGURE_OPTIONS=\"\$configure_options\"" -echo standalone.at:83 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo standalone.at:85 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $MAKE CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ CONFIGURE_OPTIONS="$configure_options" ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $MAKE CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \ + ( :; $MAKE CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ CONFIGURE_OPTIONS="$configure_options" ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:83: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:85" +$at_failed && at_func_log_failure $at_traceon ) + + $at_traceoff -echo "$at_srcdir/standalone.at:87: ./ltdldemo; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/standalone.at:87: ./ltdldemo; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./ltdldemo\" || test -x \"./ltdldemo\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo standalone.at:87 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./ltdldemo" || test -x "./ltdldemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./ltdldemo" || test -x "./ltdldemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/standalone.at:87: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/standalone.at:87" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-8 ) # Banner 8. subproject.at:25 - cat <<\_ATEOF - -Subproject Libltdl. - -_ATEOF - ;; - - 44 ) # 44. subproject.at:57: compiling softlinked libltdl - at_setup_line='subproject.at:57' - at_desc="compiling softlinked libltdl" - $at_quiet $ECHO_N " 44: compiling softlinked libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_45 +#AT_START_46 +# 46. subproject.at:57: compiling softlinked libltdl +at_setup_line='subproject.at:57' +at_func_banner 8 +at_desc="compiling softlinked libltdl" +$at_quiet $as_echo_n " 46: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "44. subproject.at:57: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "46. subproject.at:57: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subproject-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subproject-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([sub/ltdl]) AC_CONFIG_AUX_DIR([sub/ltdl/config]) AC_CONFIG_MACRO_DIR([sub/ltdl/m4]) @@ -15500,7 +12203,7 @@ ACLOCAL_AMFLAGS = -I sub/ltdl/m4 AUTOMAKE_OPTIONS = 1.9 SUBDIRS = sub/ltdl lib_LTLIBRARIES = foo.la -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined _ATEOF @@ -15511,44 +12214,23 @@ $LIBTOOLIZE --ltdl $at_traceoff -echo "$at_srcdir/subproject.at:61: \$ACLOCAL -I sub/ltdl/m4" -echo subproject.at:61 >"$at_check_line_file" +$as_echo "$at_srcdir/subproject.at:62: \$ACLOCAL -I sub/ltdl/m4" +echo subproject.at:62 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I sub/ltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I sub/ltdl/m4"; then + ( $at_traceon; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:62" +$at_failed && at_func_log_failure $at_traceon @@ -15556,124 +12238,67 @@ $at_traceon $at_traceoff -echo "$at_srcdir/subproject.at:61: \$AUTOMAKE --add-missing --copy" -echo subproject.at:61 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing --copy" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:62: \$AUTOMAKE --add-missing --copy" +echo subproject.at:62 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing --copy"; then + ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:62" if $at_failed; then $at_traceoff -echo "$at_srcdir/subproject.at:61: grep 'require .*but have' stderr && (exit 77)" -echo subproject.at:61 >"$at_check_line_file" +$as_echo "$at_srcdir/subproject.at:62: grep 'require .*but have' stderr && (exit 77)" +echo subproject.at:62 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/subproject.at:61: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/subproject.at:62" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/subproject.at:61: \$AUTOCONF " -echo subproject.at:61 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:62: \$AUTOCONF " +echo subproject.at:62 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:62" +$at_failed && at_func_log_failure $at_traceon @@ -15681,153 +12306,94 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/subproject.at:61: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " -echo subproject.at:61 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:62: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +echo subproject.at:62 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:62" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/subproject.at:61: \$MAKE all \$tst_dist " -echo subproject.at:61 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:62: \$MAKE all \$tst_dist " +echo subproject.at:62 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all $tst_dist "; then + ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:61: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:62" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/subproject.at:64: test -f sub/ltdl/libltdlc.la" +$as_echo "$at_srcdir/subproject.at:64: test -f sub/ltdl/libltdlc.la" echo subproject.at:64 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f sub/ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f sub/ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f sub/ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f sub/ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:64: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:64" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi - -$at_traceon - - - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - 45 ) # 45. subproject.at:73: compiling copied libltdl - at_setup_line='subproject.at:73' - at_desc="compiling copied libltdl" - $at_quiet $ECHO_N " 45: compiling copied libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_46 +#AT_START_47 +# 47. subproject.at:73: compiling copied libltdl +at_setup_line='subproject.at:73' +at_func_banner 8 +at_desc="compiling copied libltdl" +$at_quiet $as_echo_n " 47: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "45. subproject.at:73: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "47. subproject.at:73: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subproject-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subproject-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([sub/ltdl]) AC_CONFIG_AUX_DIR([sub/ltdl/config]) AC_CONFIG_MACRO_DIR([sub/ltdl/m4]) @@ -15844,7 +12410,7 @@ ACLOCAL_AMFLAGS = -I sub/ltdl/m4 AUTOMAKE_OPTIONS = 1.9 SUBDIRS = sub/ltdl lib_LTLIBRARIES = foo.la -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined _ATEOF @@ -15855,44 +12421,23 @@ $LIBTOOLIZE --copy --ltdl $at_traceoff -echo "$at_srcdir/subproject.at:77: \$ACLOCAL -I sub/ltdl/m4" -echo subproject.at:77 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I sub/ltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:78: \$ACLOCAL -I sub/ltdl/m4" +echo subproject.at:78 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I sub/ltdl/m4"; then + ( $at_traceon; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:77: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:78" +$at_failed && at_func_log_failure $at_traceon @@ -15900,124 +12445,67 @@ $at_traceon $at_traceoff -echo "$at_srcdir/subproject.at:77: \$AUTOMAKE --add-missing --copy" -echo subproject.at:77 >"$at_check_line_file" +$as_echo "$at_srcdir/subproject.at:78: \$AUTOMAKE --add-missing --copy" +echo subproject.at:78 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing --copy" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing --copy"; then + ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:77: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:78" if $at_failed; then $at_traceoff -echo "$at_srcdir/subproject.at:77: grep 'require .*but have' stderr && (exit 77)" -echo subproject.at:77 >"$at_check_line_file" +$as_echo "$at_srcdir/subproject.at:78: grep 'require .*but have' stderr && (exit 77)" +echo subproject.at:78 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/subproject.at:77: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/subproject.at:78" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/subproject.at:77: \$AUTOCONF " -echo subproject.at:77 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:78: \$AUTOCONF " +echo subproject.at:78 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:77: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:78" +$at_failed && at_func_log_failure $at_traceon @@ -16025,155 +12513,96 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/subproject.at:77: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " -echo subproject.at:77 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:78: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +echo subproject.at:78 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:77: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:78" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/subproject.at:77: \$MAKE all \$tst_dist " -echo subproject.at:77 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:78: \$MAKE all \$tst_dist " +echo subproject.at:78 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all $tst_dist "; then + ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:77: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:78" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/subproject.at:80: test -f sub/ltdl/libltdlc.la" +$as_echo "$at_srcdir/subproject.at:80: test -f sub/ltdl/libltdlc.la" echo subproject.at:80 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f sub/ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f sub/ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f sub/ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f sub/ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:80: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:80" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 46 ) # 46. subproject.at:89: installable libltdl - at_setup_line='subproject.at:89' - at_desc="installable libltdl" - $at_quiet $ECHO_N " 46: installable libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_47 +#AT_START_48 +# 48. subproject.at:89: installable libltdl +at_setup_line='subproject.at:89' +at_func_banner 8 +at_desc="installable libltdl" +$at_quiet $as_echo_n " 48: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "46. subproject.at:89: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "48. subproject.at:89: testing ..." + $at_traceon prefix=`pwd`/_inst cat >configure.ac <<'_ATEOF' -AC_INIT([subproject-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subproject-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([sub/ltdl]) AC_CONFIG_AUX_DIR([sub/ltdl/config]) AC_CONFIG_MACRO_DIR([sub/ltdl/m4]) @@ -16190,7 +12619,7 @@ ACLOCAL_AMFLAGS = -I sub/ltdl/m4 AUTOMAKE_OPTIONS = 1.9 SUBDIRS = sub/ltdl lib_LTLIBRARIES = foo.la -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined _ATEOF @@ -16201,44 +12630,23 @@ $LIBTOOLIZE --copy --ltdl $at_traceoff -echo "$at_srcdir/subproject.at:95: \$ACLOCAL -I sub/ltdl/m4" -echo subproject.at:95 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I sub/ltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:97: \$ACLOCAL -I sub/ltdl/m4" +echo subproject.at:97 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I sub/ltdl/m4"; then + ( $at_traceon; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I sub/ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:95: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:97" +$at_failed && at_func_log_failure $at_traceon @@ -16246,124 +12654,67 @@ $at_traceon $at_traceoff -echo "$at_srcdir/subproject.at:95: \$AUTOMAKE --add-missing --copy" -echo subproject.at:95 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing --copy" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:97: \$AUTOMAKE --add-missing --copy" +echo subproject.at:97 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing --copy"; then + ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:95: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:97" if $at_failed; then $at_traceoff -echo "$at_srcdir/subproject.at:95: grep 'require .*but have' stderr && (exit 77)" -echo subproject.at:95 >"$at_check_line_file" +$as_echo "$at_srcdir/subproject.at:97: grep 'require .*but have' stderr && (exit 77)" +echo subproject.at:97 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/subproject.at:95: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/subproject.at:97" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/subproject.at:95: \$AUTOCONF " -echo subproject.at:95 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:97: \$AUTOCONF " +echo subproject.at:97 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:95: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:97" +$at_failed && at_func_log_failure $at_traceon @@ -16371,191 +12722,108 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/subproject.at:95: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" -echo subproject.at:95 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/subproject.at:97: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" +echo subproject.at:97 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix"; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:95: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:97" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/subproject.at:95: \$MAKE all install \$tst_dist " -echo subproject.at:95 >"$at_check_line_file" +$as_echo "$at_srcdir/subproject.at:97: \$MAKE all install \$tst_dist " +echo subproject.at:97 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all install $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all install $tst_dist "; then + ( $at_traceon; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:95: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:97" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/subproject.at:99: test -f \$prefix/lib/libltdl.la" +$as_echo "$at_srcdir/subproject.at:99: test -f \$prefix/lib/libltdl.la" echo subproject.at:99 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/lib/libltdl.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/lib/libltdl.la"; then + ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:99: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:99" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/subproject.at:100: test -f \$prefix/include/ltdl.h" +$as_echo "$at_srcdir/subproject.at:100: test -f \$prefix/include/ltdl.h" echo subproject.at:100 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/include/ltdl.h" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/include/ltdl.h"; then + ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:100: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:100" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 47 ) # 47. subproject.at:109: linking libltdl without autotools - at_setup_line='subproject.at:109' - at_desc="linking libltdl without autotools" - $at_quiet $ECHO_N " 47: linking libltdl without autotools $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "47. subproject.at:109: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_48 +#AT_START_49 +# 49. subproject.at:109: linking libltdl without autotools +at_setup_line='subproject.at:109' +at_func_banner 8 +at_desc="linking libltdl without autotools" +$at_quiet $as_echo_n " 49: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "49. subproject.at:109: testing ..." + $at_traceon cat >module.c <<'_ATEOF' @@ -16662,130 +12930,90 @@ $LIBTOOLIZE --copy --ltdl=sub/ltdl ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/subproject.at:113: \$MAKE CC=\"\$CC\" LIBTOOLFLAGS=\"\$LIBTOOLFLAGS\" CPPFLAGS=\"\$CPPFLAGS\" \\ +$as_echo "$at_srcdir/subproject.at:115: \$MAKE CC=\"\$CC\" LIBTOOLFLAGS=\"\$LIBTOOLFLAGS\" CPPFLAGS=\"\$CPPFLAGS\" \\ CFLAGS=\"\$CFLAGS\" LDFLAGS=\"\$LDFLAGS\" SHELL=\"\$SHELL\" MAKE=\"\${MAKE-make}\" \\ CONFIGURE_OPTIONS=\"\$configure_options\"" -echo subproject.at:113 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains a ${...} parameter expansion)' -fi +echo subproject.at:115 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \ +if { echo 'Not enabling shell tracing (command contains a ${...} parameter expansion)' + false; }; then + ( $at_traceon; $MAKE CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" SHELL="$SHELL" MAKE="${MAKE-make}" \ CONFIGURE_OPTIONS="$configure_options" ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $MAKE CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \ + ( :; $MAKE CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" SHELL="$SHELL" MAKE="${MAKE-make}" \ CONFIGURE_OPTIONS="$configure_options" ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:113: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:115" +$at_failed && at_func_log_failure $at_traceon ) + + $at_traceoff -echo "$at_srcdir/subproject.at:117: ./ltdldemo; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/subproject.at:117: ./ltdldemo; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./ltdldemo\" || test -x \"./ltdldemo\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo subproject.at:117 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./ltdldemo" || test -x "./ltdldemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./ltdldemo; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./ltdldemo" || test -x "./ltdldemo"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/subproject.at:117: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/subproject.at:117" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-9 ) # Banner 9. nonrecursive.at:26 - cat <<\_ATEOF - -Nonrecursive Automake Libltdl. - -_ATEOF - ;; - - 48 ) # 48. nonrecursive.at:78: compiling softlinked libltdl - at_setup_line='nonrecursive.at:78' - at_desc="compiling softlinked libltdl" - $at_quiet $ECHO_N " 48: compiling softlinked libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_49 +#AT_START_50 +# 50. nonrecursive.at:78: compiling softlinked libltdl +at_setup_line='nonrecursive.at:78' +at_func_banner 9 +at_desc="compiling softlinked libltdl" +$at_quiet $as_echo_n " 50: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOHEADER" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "48. nonrecursive.at:78: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "50. nonrecursive.at:78: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subdirectory-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subdirectory-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -16821,7 +13049,7 @@ MOSTLYCLEANFILES = include ltdl/Makefile.inc -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined foo_la_SOURCES = foo.c _ATEOF @@ -16833,40 +13061,22 @@ $LIBTOOLIZE --ltdl $at_traceoff -echo "$at_srcdir/nonrecursive.at:83: if test -f ltdl/configure.ac; then false; fi" +$as_echo "$at_srcdir/nonrecursive.at:83: if test -f ltdl/configure.ac; then false; fi" echo nonrecursive.at:83 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:83: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:83" +$at_failed && at_func_log_failure $at_traceon @@ -16877,212 +13087,113 @@ done $at_traceoff -echo "$at_srcdir/nonrecursive.at:90: \$ACLOCAL -I ltdl/m4" -echo nonrecursive.at:90 >"$at_check_line_file" +$as_echo "$at_srcdir/nonrecursive.at:91: \$ACLOCAL -I ltdl/m4" +echo nonrecursive.at:91 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I ltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I ltdl/m4"; then + ( $at_traceon; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:90: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:91" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:90: \$AUTOHEADER " -echo nonrecursive.at:90 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOHEADER " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:91: \$AUTOHEADER " +echo nonrecursive.at:91 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOHEADER "; then + ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:90: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:91" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:90: \$AUTOMAKE --add-missing --copy" -echo nonrecursive.at:90 >"$at_check_line_file" +$as_echo "$at_srcdir/nonrecursive.at:91: \$AUTOMAKE --add-missing --copy" +echo nonrecursive.at:91 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing --copy" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing --copy"; then + ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:90: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:91" if $at_failed; then $at_traceoff -echo "$at_srcdir/nonrecursive.at:90: grep 'require .*but have' stderr && (exit 77)" -echo nonrecursive.at:90 >"$at_check_line_file" +$as_echo "$at_srcdir/nonrecursive.at:91: grep 'require .*but have' stderr && (exit 77)" +echo nonrecursive.at:91 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/nonrecursive.at:90: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/nonrecursive.at:91" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:90: \$AUTOCONF " -echo nonrecursive.at:90 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:91: \$AUTOCONF " +echo nonrecursive.at:91 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:90: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:91" +$at_failed && at_func_log_failure $at_traceon @@ -17090,154 +13201,95 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/nonrecursive.at:90: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " -echo nonrecursive.at:90 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:91: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +echo nonrecursive.at:91 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:90: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:91" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/nonrecursive.at:90: \$MAKE all \$tst_dist " -echo nonrecursive.at:90 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:91: \$MAKE all \$tst_dist " +echo nonrecursive.at:91 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all $tst_dist "; then + ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:90: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:91" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/nonrecursive.at:93: test -f ltdl/libltdlc.la" +$as_echo "$at_srcdir/nonrecursive.at:93: test -f ltdl/libltdlc.la" echo nonrecursive.at:93 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:93: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:93" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 49 ) # 49. nonrecursive.at:102: compiling copied libltdl - at_setup_line='nonrecursive.at:102' - at_desc="compiling copied libltdl" - $at_quiet $ECHO_N " 49: compiling copied libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_50 +#AT_START_51 +# 51. nonrecursive.at:102: compiling copied libltdl +at_setup_line='nonrecursive.at:102' +at_func_banner 9 +at_desc="compiling copied libltdl" +$at_quiet $as_echo_n " 51: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOHEADER" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "49. nonrecursive.at:102: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "51. nonrecursive.at:102: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subdirectory-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subdirectory-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -17273,7 +13325,7 @@ MOSTLYCLEANFILES = include ltdl/Makefile.inc -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined foo_la_SOURCES = foo.c _ATEOF @@ -17285,40 +13337,22 @@ $LIBTOOLIZE --copy --ltdl $at_traceoff -echo "$at_srcdir/nonrecursive.at:107: if test -f ltdl/configure.ac; then false; fi" +$as_echo "$at_srcdir/nonrecursive.at:107: if test -f ltdl/configure.ac; then false; fi" echo nonrecursive.at:107 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:107: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:107" +$at_failed && at_func_log_failure $at_traceon @@ -17329,212 +13363,113 @@ done $at_traceoff -echo "$at_srcdir/nonrecursive.at:114: \$ACLOCAL -I ltdl/m4" -echo nonrecursive.at:114 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I ltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:115: \$ACLOCAL -I ltdl/m4" +echo nonrecursive.at:115 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I ltdl/m4"; then + ( $at_traceon; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:115" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:114: \$AUTOHEADER " -echo nonrecursive.at:114 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOHEADER " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:115: \$AUTOHEADER " +echo nonrecursive.at:115 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOHEADER "; then + ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:115" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:114: \$AUTOMAKE --add-missing --copy" -echo nonrecursive.at:114 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing --copy" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:115: \$AUTOMAKE --add-missing --copy" +echo nonrecursive.at:115 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing --copy"; then + ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:115" if $at_failed; then $at_traceoff -echo "$at_srcdir/nonrecursive.at:114: grep 'require .*but have' stderr && (exit 77)" -echo nonrecursive.at:114 >"$at_check_line_file" +$as_echo "$at_srcdir/nonrecursive.at:115: grep 'require .*but have' stderr && (exit 77)" +echo nonrecursive.at:115 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/nonrecursive.at:114: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/nonrecursive.at:115" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:114: \$AUTOCONF " -echo nonrecursive.at:114 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:115: \$AUTOCONF " +echo nonrecursive.at:115 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:115" +$at_failed && at_func_log_failure $at_traceon @@ -17542,154 +13477,95 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/nonrecursive.at:114: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " -echo nonrecursive.at:114 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:115: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +echo nonrecursive.at:115 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:115" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/nonrecursive.at:114: \$MAKE all \$tst_dist " -echo nonrecursive.at:114 >"$at_check_line_file" +$as_echo "$at_srcdir/nonrecursive.at:115: \$MAKE all \$tst_dist " +echo nonrecursive.at:115 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all $tst_dist "; then + ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:115" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/nonrecursive.at:117: test -f ltdl/libltdlc.la" +$as_echo "$at_srcdir/nonrecursive.at:117: test -f ltdl/libltdlc.la" echo nonrecursive.at:117 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:117: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:117" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 50 ) # 50. nonrecursive.at:126: installable libltdl - at_setup_line='nonrecursive.at:126' - at_desc="installable libltdl" - $at_quiet $ECHO_N " 50: installable libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_51 +#AT_START_52 +# 52. nonrecursive.at:126: installable libltdl +at_setup_line='nonrecursive.at:126' +at_func_banner 9 +at_desc="installable libltdl" +$at_quiet $as_echo_n " 52: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOHEADER" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "50. nonrecursive.at:126: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "52. nonrecursive.at:126: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subdirectory-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subdirectory-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -17725,7 +13601,7 @@ MOSTLYCLEANFILES = include ltdl/Makefile.inc -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined foo_la_SOURCES = foo.c _ATEOF @@ -17739,40 +13615,22 @@ $LIBTOOLIZE --copy --ltdl $at_traceoff -echo "$at_srcdir/nonrecursive.at:133: if test -f ltdl/configure.ac; then false; fi" +$as_echo "$at_srcdir/nonrecursive.at:133: if test -f ltdl/configure.ac; then false; fi" echo nonrecursive.at:133 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:133: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:133" +$at_failed && at_func_log_failure $at_traceon @@ -17783,212 +13641,113 @@ done $at_traceoff -echo "$at_srcdir/nonrecursive.at:140: \$ACLOCAL -I ltdl/m4" -echo nonrecursive.at:140 >"$at_check_line_file" +$as_echo "$at_srcdir/nonrecursive.at:141: \$ACLOCAL -I ltdl/m4" +echo nonrecursive.at:141 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I ltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I ltdl/m4"; then + ( $at_traceon; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I ltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:140: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:141" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:140: \$AUTOHEADER " -echo nonrecursive.at:140 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOHEADER " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:141: \$AUTOHEADER " +echo nonrecursive.at:141 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOHEADER "; then + ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:140: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:141" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:140: \$AUTOMAKE --add-missing --copy" -echo nonrecursive.at:140 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing --copy" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:141: \$AUTOMAKE --add-missing --copy" +echo nonrecursive.at:141 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing --copy"; then + ( $at_traceon; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing --copy ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:140: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:141" if $at_failed; then $at_traceoff -echo "$at_srcdir/nonrecursive.at:140: grep 'require .*but have' stderr && (exit 77)" -echo nonrecursive.at:140 >"$at_check_line_file" +$as_echo "$at_srcdir/nonrecursive.at:141: grep 'require .*but have' stderr && (exit 77)" +echo nonrecursive.at:141 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/nonrecursive.at:140: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/nonrecursive.at:141" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:140: \$AUTOCONF " -echo nonrecursive.at:140 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:141: \$AUTOCONF " +echo nonrecursive.at:141 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:140: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:141" +$at_failed && at_func_log_failure $at_traceon @@ -17996,205 +13755,113 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/nonrecursive.at:140: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" -echo nonrecursive.at:140 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:141: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" +echo nonrecursive.at:141 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix"; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:140: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:141" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/nonrecursive.at:140: \$MAKE all install \$tst_dist " -echo nonrecursive.at:140 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all install $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/nonrecursive.at:141: \$MAKE all install \$tst_dist " +echo nonrecursive.at:141 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all install $tst_dist "; then + ( $at_traceon; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:140: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:141" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/nonrecursive.at:143: test -f \$prefix/lib/libltdl.la" +$as_echo "$at_srcdir/nonrecursive.at:143: test -f \$prefix/lib/libltdl.la" echo nonrecursive.at:143 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/lib/libltdl.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/lib/libltdl.la"; then + ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:143: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:143" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/nonrecursive.at:144: test -f \$prefix/include/ltdl.h" +$as_echo "$at_srcdir/nonrecursive.at:144: test -f \$prefix/include/ltdl.h" echo nonrecursive.at:144 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/include/ltdl.h" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/include/ltdl.h"; then + ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/nonrecursive.at:144: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/nonrecursive.at:144" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-10 ) # Banner 10. recursive.at:25 - cat <<\_ATEOF - -Recursive Automake Libltdl. - -_ATEOF - ;; - - 51 ) # 51. recursive.at:60: compiling softlinked libltdl - at_setup_line='recursive.at:60' - at_desc="compiling softlinked libltdl" - $at_quiet $ECHO_N " 51: compiling softlinked libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_52 +#AT_START_53 +# 53. recursive.at:60: compiling softlinked libltdl +at_setup_line='recursive.at:60' +at_func_banner 10 +at_desc="compiling softlinked libltdl" +$at_quiet $as_echo_n " 53: $at_desc " +at_xfail=no case ,$AUTORECONF,$AUTOCONF,$AUTOHEADER,$ACLOCAL,$AUTOMAKE, in *,no,*) :;; *) false;; esac && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "51. recursive.at:60: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "53. recursive.at:60: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subdirectory-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subdirectory-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -18213,7 +13880,7 @@ ACLOCAL_AMFLAGS = -I ltdl/m4 AUTOMAKE_OPTIONS = 1.7 SUBDIRS = ltdl lib_LTLIBRARIES = foo.la -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined foo_la_SOURCES = foo.c _ATEOF @@ -18225,118 +13892,64 @@ $LIBTOOLIZE --ltdl $at_traceoff -echo "$at_srcdir/recursive.at:65: if test -f ltdl/configure.ac; then false; fi" +$as_echo "$at_srcdir/recursive.at:65: if test -f ltdl/configure.ac; then false; fi" echo recursive.at:65 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:65: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:65" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/recursive.at:67: \$AUTORECONF --force --verbose --install" +$as_echo "$at_srcdir/recursive.at:67: \$AUTORECONF --force --verbose --install" echo recursive.at:67 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTORECONF --force --verbose --install" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTORECONF --force --verbose --install"; then + ( $at_traceon; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:67: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:67" if $at_failed; then $at_traceoff -echo "$at_srcdir/recursive.at:67: grep 'require .*but have' stderr && (exit 77)" +$as_echo "$at_srcdir/recursive.at:67: grep 'require .*but have' stderr && (exit 77)" echo recursive.at:67 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/recursive.at:67: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/recursive.at:67" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon @@ -18344,150 +13957,91 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/recursive.at:68: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +$as_echo "$at_srcdir/recursive.at:68: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " echo recursive.at:68 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:68: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:68" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/recursive.at:69: \$MAKE all \$tst_dist " +$as_echo "$at_srcdir/recursive.at:69: \$MAKE all \$tst_dist " echo recursive.at:69 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all $tst_dist "; then + ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:69: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:69" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/recursive.at:71: test -f ltdl/libltdlc.la" +$as_echo "$at_srcdir/recursive.at:71: test -f ltdl/libltdlc.la" echo recursive.at:71 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:71: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:71" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 52 ) # 52. recursive.at:80: compiling copied libltdl - at_setup_line='recursive.at:80' - at_desc="compiling copied libltdl" - $at_quiet $ECHO_N " 52: compiling copied libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_53 +#AT_START_54 +# 54. recursive.at:80: compiling copied libltdl +at_setup_line='recursive.at:80' +at_func_banner 10 +at_desc="compiling copied libltdl" +$at_quiet $as_echo_n " 54: $at_desc " +at_xfail=no case ,$AUTORECONF,$AUTOCONF,$AUTOHEADER,$ACLOCAL,$AUTOMAKE, in *,no,*) :;; *) false;; esac && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "52. recursive.at:80: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "54. recursive.at:80: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subdirectory-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subdirectory-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -18506,7 +14060,7 @@ ACLOCAL_AMFLAGS = -I ltdl/m4 AUTOMAKE_OPTIONS = 1.7 SUBDIRS = ltdl lib_LTLIBRARIES = foo.la -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined foo_la_SOURCES = foo.c _ATEOF @@ -18518,118 +14072,64 @@ $LIBTOOLIZE --copy --ltdl $at_traceoff -echo "$at_srcdir/recursive.at:85: if test -f ltdl/configure.ac; then false; fi" +$as_echo "$at_srcdir/recursive.at:85: if test -f ltdl/configure.ac; then false; fi" echo recursive.at:85 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:85: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:85" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/recursive.at:87: \$AUTORECONF --force --verbose --install" +$as_echo "$at_srcdir/recursive.at:87: \$AUTORECONF --force --verbose --install" echo recursive.at:87 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTORECONF --force --verbose --install" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTORECONF --force --verbose --install"; then + ( $at_traceon; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:87: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:87" if $at_failed; then $at_traceoff -echo "$at_srcdir/recursive.at:87: grep 'require .*but have' stderr && (exit 77)" +$as_echo "$at_srcdir/recursive.at:87: grep 'require .*but have' stderr && (exit 77)" echo recursive.at:87 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/recursive.at:87: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/recursive.at:87" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon @@ -18637,150 +14137,91 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/recursive.at:88: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +$as_echo "$at_srcdir/recursive.at:88: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " echo recursive.at:88 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:88: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:88" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/recursive.at:89: \$MAKE all \$tst_dist " +$as_echo "$at_srcdir/recursive.at:89: \$MAKE all \$tst_dist " echo recursive.at:89 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all $tst_dist "; then + ( $at_traceon; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:89: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:89" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/recursive.at:91: test -f ltdl/libltdlc.la" +$as_echo "$at_srcdir/recursive.at:91: test -f ltdl/libltdlc.la" echo recursive.at:91 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f ltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:91: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:91" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 53 ) # 53. recursive.at:100: installable libltdl - at_setup_line='recursive.at:100' - at_desc="installable libltdl" - $at_quiet $ECHO_N " 53: installable libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_54 +#AT_START_55 +# 55. recursive.at:100: installable libltdl +at_setup_line='recursive.at:100' +at_func_banner 10 +at_desc="installable libltdl" +$at_quiet $as_echo_n " 55: $at_desc " +at_xfail=no case ,$AUTORECONF,$AUTOCONF,$AUTOHEADER,$ACLOCAL,$AUTOMAKE, in *,no,*) :;; *) false;; esac && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "53. recursive.at:100: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "55. recursive.at:100: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([subdirectory-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([subdirectory-demo], 2.2.2, bug-libtool@gnu.org) LT_CONFIG_LTDL_DIR([ltdl]) AC_CONFIG_AUX_DIR([ltdl/config]) AC_CONFIG_MACRO_DIR([ltdl/m4]) @@ -18799,7 +14240,7 @@ ACLOCAL_AMFLAGS = -I ltdl/m4 AUTOMAKE_OPTIONS = 1.7 SUBDIRS = ltdl lib_LTLIBRARIES = foo.la -foo_la_LDFLAGS = -module -avoid-version +foo_la_LDFLAGS = -module -avoid-version -no-undefined foo_la_SOURCES = foo.c _ATEOF @@ -18813,118 +14254,64 @@ $LIBTOOLIZE --copy --ltdl $at_traceoff -echo "$at_srcdir/recursive.at:107: if test -f ltdl/configure.ac; then false; fi" +$as_echo "$at_srcdir/recursive.at:107: if test -f ltdl/configure.ac; then false; fi" echo recursive.at:107 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; if test -f ltdl/configure.ac; then false; fi ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:107: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:107" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/recursive.at:109: \$AUTORECONF --force --verbose --install" +$as_echo "$at_srcdir/recursive.at:109: \$AUTORECONF --force --verbose --install" echo recursive.at:109 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTORECONF --force --verbose --install" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTORECONF --force --verbose --install"; then + ( $at_traceon; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTORECONF --force --verbose --install ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:109: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:109" if $at_failed; then $at_traceoff -echo "$at_srcdir/recursive.at:109: grep 'require .*but have' stderr && (exit 77)" +$as_echo "$at_srcdir/recursive.at:109: grep 'require .*but have' stderr && (exit 77)" echo recursive.at:109 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/recursive.at:109: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/recursive.at:109" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon @@ -18932,281 +14319,147 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/recursive.at:110: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" +$as_echo "$at_srcdir/recursive.at:110: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" echo recursive.at:110 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix"; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:110: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:110" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/recursive.at:111: \$MAKE all install \$tst_dist " +$as_echo "$at_srcdir/recursive.at:111: \$MAKE all install \$tst_dist " echo recursive.at:111 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all install $tst_dist " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all install $tst_dist "; then + ( $at_traceon; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all install $tst_dist ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:111: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:111" +$at_failed && at_func_log_failure $at_traceon ) $at_traceoff -echo "$at_srcdir/recursive.at:113: test -f \$prefix/lib/libltdl.la" +$as_echo "$at_srcdir/recursive.at:113: test -f \$prefix/lib/libltdl.la" echo recursive.at:113 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/lib/libltdl.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/lib/libltdl.la"; then + ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:113: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:113" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/recursive.at:114: test -f \$prefix/include/ltdl.h" +$as_echo "$at_srcdir/recursive.at:114: test -f \$prefix/include/ltdl.h" echo recursive.at:114 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/include/ltdl.h" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/include/ltdl.h"; then + ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/recursive.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/recursive.at:114" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-11 ) # Banner 11. template.at:25 - cat <<\_ATEOF - -C++ template tests. - -_ATEOF - ;; - - 54 ) # 54. template.at:27: simple template test - at_setup_line='template.at:27' - at_desc="simple template test" - $at_quiet $ECHO_N " 54: simple template test $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "54. template.at:27: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_55 +#AT_START_56 +# 56. template.at:27: simple template test +at_setup_line='template.at:27' +at_func_banner 11 +at_desc="simple template test" +$at_quiet $as_echo_n " 56: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "56. template.at:27: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/template.at:28: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" +$as_echo "$at_srcdir/template.at:28: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" echo template.at:28 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)"; then + ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:28: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:28" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:28: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" +$as_echo "$at_srcdir/template.at:28: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" echo template.at:28 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)"; then + ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:28: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:28" +$at_failed && at_func_log_failure $at_traceon @@ -19266,296 +14519,155 @@ _ATEOF $at_traceoff -echo "$at_srcdir/template.at:79: \$LIBTOOL --tag=CXX --mode=compile \$CXX -I. \$CPPFLAGS \$CXXFLAGS -c -o alib.lo alib.cpp" -echo template.at:79 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o alib.lo alib.cpp" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:80: \$LIBTOOL --tag=CXX --mode=compile \$CXX -I. \$CPPFLAGS \$CXXFLAGS -c -o alib.lo alib.cpp" +echo template.at:80 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o alib.lo alib.cpp ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o alib.lo alib.cpp"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o alib.lo alib.cpp ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o alib.lo alib.cpp ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o alib.lo alib.cpp ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:79: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:80" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:81: \$LIBTOOL --tag=CXX --mode=compile \$CXX -I. \$CPPFLAGS \$CXXFLAGS -c -o aclib.lo aclib.cpp" -echo template.at:81 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o aclib.lo aclib.cpp" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:82: \$LIBTOOL --tag=CXX --mode=compile \$CXX -I. \$CPPFLAGS \$CXXFLAGS -c -o aclib.lo aclib.cpp" +echo template.at:82 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o aclib.lo aclib.cpp ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o aclib.lo aclib.cpp"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o aclib.lo aclib.cpp ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o aclib.lo aclib.cpp ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=compile $CXX -I. $CPPFLAGS $CXXFLAGS -c -o aclib.lo aclib.cpp ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:81: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:82" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:83: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CPPFLAGS \$CXXFLAGS \$LDFLAGS -o libaclib.la aclib.lo" -echo template.at:83 >"$at_check_line_file" +$as_echo "$at_srcdir/template.at:84: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CPPFLAGS \$CXXFLAGS \$LDFLAGS -o libaclib.la aclib.lo" +echo template.at:84 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libaclib.la aclib.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libaclib.la aclib.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libaclib.la aclib.lo"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libaclib.la aclib.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libaclib.la aclib.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libaclib.la aclib.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:83: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:84" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:85: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CPPFLAGS \$CXXFLAGS \$LDFLAGS -o libalib.la -rpath /usr/local/lib alib.lo libaclib.la" -echo template.at:85 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libalib.la -rpath /usr/local/lib alib.lo libaclib.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:86: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CPPFLAGS \$CXXFLAGS \$LDFLAGS -o libalib.la -rpath /usr/local/lib alib.lo libaclib.la" +echo template.at:86 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libalib.la -rpath /usr/local/lib alib.lo libaclib.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libalib.la -rpath /usr/local/lib alib.lo libaclib.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libalib.la -rpath /usr/local/lib alib.lo libaclib.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libalib.la -rpath /usr/local/lib alib.lo libaclib.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o libalib.la -rpath /usr/local/lib alib.lo libaclib.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:85: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:86" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:87: \$CXX -I. \$CPPFLAGS \$CXXFLAGS -c prog.cpp" -echo template.at:87 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$CXX -I. $CPPFLAGS $CXXFLAGS -c prog.cpp" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:88: \$CXX -I. \$CPPFLAGS \$CXXFLAGS -c prog.cpp" +echo template.at:88 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $CXX -I. $CPPFLAGS $CXXFLAGS -c prog.cpp ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$CXX -I. $CPPFLAGS $CXXFLAGS -c prog.cpp"; then + ( $at_traceon; $CXX -I. $CPPFLAGS $CXXFLAGS -c prog.cpp ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $CXX -I. $CPPFLAGS $CXXFLAGS -c prog.cpp ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $CXX -I. $CPPFLAGS $CXXFLAGS -c prog.cpp ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:87: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:88" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:89: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CPPFLAGS \$CXXFLAGS \$LDFLAGS -o prog prog.\$OBJEXT libalib.la" -echo template.at:89 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o prog prog.$OBJEXT libalib.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:90: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CPPFLAGS \$CXXFLAGS \$LDFLAGS -o prog prog.\$OBJEXT libalib.la" +echo template.at:90 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o prog prog.$OBJEXT libalib.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o prog prog.$OBJEXT libalib.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o prog prog.$OBJEXT libalib.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o prog prog.$OBJEXT libalib.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o prog prog.$OBJEXT libalib.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:89: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/template.at:90" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/template.at:92: ./prog; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/template.at:92: ./prog; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./prog\" || test -x \"./prog\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo template.at:92 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./prog; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./prog; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./prog" || test -x "./prog"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./prog; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./prog; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./prog" || test -x "./prog"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:92: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:92" +$at_failed && at_func_log_failure $at_traceon @@ -19564,103 +14676,62 @@ $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 55 ) # 55. template.at:126: template test with subdirs - at_setup_line='template.at:126' - at_desc="template test with subdirs" - $at_quiet $ECHO_N " 55: template test with subdirs $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "55. template.at:126: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_56 +#AT_START_57 +# 57. template.at:126: template test with subdirs +at_setup_line='template.at:126' +at_func_banner 11 +at_desc="template test with subdirs" +$at_quiet $as_echo_n " 57: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "57. template.at:126: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/template.at:127: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" +$as_echo "$at_srcdir/template.at:127: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" echo template.at:127 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)"; then + ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:127: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:127" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:127: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" +$as_echo "$at_srcdir/template.at:127: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" echo template.at:127 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)"; then + ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:127: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:127" +$at_failed && at_func_log_failure $at_traceon @@ -19762,513 +14833,275 @@ case $compiler_c_o in yes) main_o=sub/main.$OBJEXT $at_traceoff -echo "$at_srcdir/template.at:220: \$CXX \$CPPFLAGS \$CXXFLAGS -c -o \$main_o ../src/sub/main.cpp" -echo template.at:220 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$CXX $CPPFLAGS $CXXFLAGS -c -o $main_o ../src/sub/main.cpp" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:221: \$CXX \$CPPFLAGS \$CXXFLAGS -c -o \$main_o ../src/sub/main.cpp" +echo template.at:221 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $CXX $CPPFLAGS $CXXFLAGS -c -o $main_o ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$CXX $CPPFLAGS $CXXFLAGS -c -o $main_o ../src/sub/main.cpp"; then + ( $at_traceon; $CXX $CPPFLAGS $CXXFLAGS -c -o $main_o ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $CXX $CPPFLAGS $CXXFLAGS -c -o $main_o ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $CXX $CPPFLAGS $CXXFLAGS -c -o $main_o ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:220: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:221" +$at_failed && at_func_log_failure $at_traceon ;; *) main_o=main.$OBJEXT $at_traceoff -echo "$at_srcdir/template.at:225: \$CXX \$CPPFLAGS \$CXXFLAGS -c ../src/sub/main.cpp" -echo template.at:225 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:226: \$CXX \$CPPFLAGS \$CXXFLAGS -c ../src/sub/main.cpp" +echo template.at:226 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp"; then + ( $at_traceon; $CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:225: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/template.at:226" - - echo 1 > "$at_status_file" - exit 1 -fi - -$at_traceon +$at_failed && at_func_log_failure +$at_traceon ;; esac $at_traceoff -echo "$at_srcdir/template.at:230: \$LIBTOOL --tag=CXX --mode=compile \$CXX \$CPPFLAGS \$CXXFLAGS -c -o lib/a.lo ../src/lib/a.cpp" -echo template.at:230 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib/a.lo ../src/lib/a.cpp" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:231: \$LIBTOOL --tag=CXX --mode=compile \$CXX \$CPPFLAGS \$CXXFLAGS -c -o lib/a.lo ../src/lib/a.cpp" +echo template.at:231 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib/a.lo ../src/lib/a.cpp ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib/a.lo ../src/lib/a.cpp"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib/a.lo ../src/lib/a.cpp ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib/a.lo ../src/lib/a.cpp ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib/a.lo ../src/lib/a.cpp ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:230: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:231" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:232: \$LIBTOOL --tag=CXX --mode=compile \$CXX \$CPPFLAGS \$CXXFLAGS -c -o lib2/b.lo ../src/lib2/b.cpp" -echo template.at:232 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib2/b.lo ../src/lib2/b.cpp" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:233: \$LIBTOOL --tag=CXX --mode=compile \$CXX \$CPPFLAGS \$CXXFLAGS -c -o lib2/b.lo ../src/lib2/b.cpp" +echo template.at:233 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib2/b.lo ../src/lib2/b.cpp ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib2/b.lo ../src/lib2/b.cpp"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib2/b.lo ../src/lib2/b.cpp ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib2/b.lo ../src/lib2/b.cpp ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS -c -o lib2/b.lo ../src/lib2/b.cpp ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:232: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:233" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:234: \$CXX \$CPPFLAGS \$CXXFLAGS -c ../src/sub/main.cpp" -echo template.at:234 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:235: \$CXX \$CPPFLAGS \$CXXFLAGS -c ../src/sub/main.cpp" +echo template.at:235 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp"; then + ( $at_traceon; $CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $CXX $CPPFLAGS $CXXFLAGS -c ../src/sub/main.cpp ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:234: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:235" +$at_failed && at_func_log_failure $at_traceon # both convenience $at_traceoff -echo "$at_srcdir/template.at:237: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib/liba.la lib/a.lo" -echo template.at:237 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:238: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib/liba.la lib/a.lo" +echo template.at:238 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:237: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:238" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:239: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo" -echo template.at:239 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:240: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo" +echo template.at:240 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:239: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:240" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:241: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la lib/liba.la" -echo template.at:241 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:242: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la lib/liba.la" +echo template.at:242 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:241: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/template.at:242" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/template.at:243: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/template.at:243: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./sub/main\" || test -x \"./sub/main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo template.at:243 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - *);; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_skip $at_status "$at_srcdir/template.at:243" +$at_failed && at_func_log_failure $at_traceon # lib convenience if $noskip; then $at_traceoff -echo "$at_srcdir/template.at:246: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /foo" -echo template.at:246 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /foo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:247: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /foo" +echo template.at:247 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /foo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /foo"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /foo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /foo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /foo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:246: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:247" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:248: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la lib/liba.la" -echo template.at:248 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:249: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la lib/liba.la" +echo template.at:249 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:248: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/template.at:249" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/template.at:250: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/template.at:250: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./sub/main\" || test -x \"./sub/main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo template.at:250 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:250: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:250" +$at_failed && at_func_log_failure $at_traceon @@ -20276,343 +15109,187 @@ fi # both installed $at_traceoff -echo "$at_srcdir/template.at:254: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib/liba.la lib/a.lo -rpath /foo" -echo template.at:254 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo -rpath /foo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:255: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib/liba.la lib/a.lo -rpath /foo" +echo template.at:255 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo -rpath /foo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo -rpath /foo"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo -rpath /foo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo -rpath /foo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo -rpath /foo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:254: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:255" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:256: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /bar" -echo template.at:256 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /bar" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:257: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /bar" +echo template.at:257 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /bar ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /bar"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /bar ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /bar ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo -rpath /bar ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:256: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:257" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:258: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la lib/liba.la" -echo template.at:258 >"$at_check_line_file" +$as_echo "$at_srcdir/template.at:259: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la lib/liba.la" +echo template.at:259 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la lib/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:258: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/template.at:259" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/template.at:260: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/template.at:260: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./sub/main\" || test -x \"./sub/main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo template.at:260 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:260: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:260" +$at_failed && at_func_log_failure $at_traceon # both convenience, libb depending on liba $at_traceoff -echo "$at_srcdir/template.at:262: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib/liba.la lib/a.lo" -echo template.at:262 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:263: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib/liba.la lib/a.lo" +echo template.at:263 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib/liba.la lib/a.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:262: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:263" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:264: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la" -echo template.at:264 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:265: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la" +echo template.at:265 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:264: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:265" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:266: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la" -echo template.at:266 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:267: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la" +echo template.at:267 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:266: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/template.at:267" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/template.at:268: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/template.at:268: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./sub/main\" || test -x \"./sub/main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo template.at:268 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:268: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:268" +$at_failed && at_func_log_failure $at_traceon @@ -20620,131 +15297,74 @@ $at_traceon if $noskip; then $at_traceoff -echo "$at_srcdir/template.at:272: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /foo" -echo template.at:272 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /foo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:273: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /foo" +echo template.at:273 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /foo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /foo"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /foo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /foo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /foo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:272: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:273" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:274: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la" -echo template.at:274 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:275: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la" +echo template.at:275 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:274: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/template.at:275" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/template.at:276: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/template.at:276: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./sub/main\" || test -x \"./sub/main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo template.at:276 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:276: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:276" +$at_failed && at_func_log_failure $at_traceon @@ -20752,131 +15372,74 @@ fi # both installed if $noskip; then $at_traceoff -echo "$at_srcdir/template.at:280: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /bar" -echo template.at:280 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /bar" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:281: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /bar" +echo template.at:281 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /bar ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /bar"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /bar ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /bar ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o lib2/libb.la lib2/b.lo lib/liba.la -rpath /bar ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:280: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/template.at:281" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/template.at:282: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la" -echo template.at:282 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/template.at:283: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS -o sub/main \$main_o lib2/libb.la" +echo template.at:283 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la"; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS -o sub/main $main_o lib2/libb.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:282: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/template.at:283" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/template.at:284: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/template.at:284: ./sub/main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./sub/main\" || test -x \"./sub/main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo template.at:284 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./sub/main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub/main" || test -x "./sub/main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:284: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:284" +$at_failed && at_func_log_failure $at_traceon @@ -20885,154 +15448,83 @@ fi cd .. $at_traceoff -echo "$at_srcdir/template.at:289: \$noskip || (exit 77)" +$as_echo "$at_srcdir/template.at:289: \$noskip || (exit 77)" echo template.at:289 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$noskip || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $noskip || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; $noskip || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "$noskip || (exit 77)"; then + ( $at_traceon; $noskip || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; $noskip || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/template.at:289: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/template.at:289" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-12 ) # Banner 12. ctor.at:25 - cat <<\_ATEOF - -Constructors. - -_ATEOF - ;; - - 56 ) # 56. ctor.at:27: C++ static constructors - at_setup_line='ctor.at:27' - at_desc="C++ static constructors" - $at_quiet $ECHO_N " 56: C++ static constructors $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "56. ctor.at:27: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_57 +#AT_START_58 +# 58. ctor.at:27: C++ static constructors +at_setup_line='ctor.at:27' +at_func_banner 12 +at_desc="C++ static constructors" +$at_quiet $as_echo_n " 58: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "58. ctor.at:27: testing ..." + $at_traceon $at_traceoff -echo "$at_srcdir/ctor.at:28: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" +$as_echo "$at_srcdir/ctor.at:28: { test -n \"\$CXX\" && test \"X\$CXX\" != Xno; } || (exit 77)" echo ctor.at:28 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "{ test -n \"$CXX\" && test \"X$CXX\" != Xno; } || (exit 77)"; then + ( $at_traceon; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; { test -n "$CXX" && test "X$CXX" != Xno; } || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/ctor.at:28: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/ctor.at:28" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/ctor.at:28: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" +$as_echo "$at_srcdir/ctor.at:28: test \"X\$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" echo ctor.at:28 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test \"X$CXX\" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)"; then + ( $at_traceon; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/ctor.at:28: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/ctor.at:28" +$at_failed && at_func_log_failure $at_traceon @@ -21067,244 +15559,153 @@ _ATEOF $at_traceoff -echo "$at_srcdir/ctor.at:56: \$LIBTOOL --tag=CXX --mode=compile \$CXX \$CPPFLAGS \$CXXFLAGS \\ +$as_echo "$at_srcdir/ctor.at:57: \$LIBTOOL --tag=CXX --mode=compile \$CXX \$CPPFLAGS \$CXXFLAGS \\ -c libctor.cpp -o libctor.lo" -echo ctor.at:56 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo ctor.at:57 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS \ -c libctor.cpp -o libctor.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS \ + ( :; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS \ -c libctor.cpp -o libctor.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/ctor.at:56: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/ctor.at:57" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/ctor.at:58: \$LIBTOOL --tag=CXX --mode=compile \$CXX \$CPPFLAGS \$CXXFLAGS \\ +$as_echo "$at_srcdir/ctor.at:59: \$LIBTOOL --tag=CXX --mode=compile \$CXX \$CPPFLAGS \$CXXFLAGS \\ -c main.cpp -o main.lo" -echo ctor.at:58 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo ctor.at:59 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS \ -c main.cpp -o main.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS \ + ( :; $LIBTOOL --tag=CXX --mode=compile $CXX $CPPFLAGS $CXXFLAGS \ -c main.cpp -o main.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/ctor.at:58: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/ctor.at:59" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/ctor.at:60: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS \\ +$as_echo "$at_srcdir/ctor.at:61: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS \\ libctor.lo -o libctor.la -rpath /none" -echo ctor.at:60 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo ctor.at:61 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS \ libctor.lo -o libctor.la -rpath /none ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS \ + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS \ libctor.lo -o libctor.la -rpath /none ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/ctor.at:60: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/ctor.at:61" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/ctor.at:62: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS \\ +$as_echo "$at_srcdir/ctor.at:63: \$LIBTOOL --tag=CXX --mode=link \$CXX \$CXXFLAGS \$LDFLAGS \\ main.lo libctor.la -o main" -echo ctor.at:62 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi +echo ctor.at:63 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS \ +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS \ main.lo libctor.la -o main ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS \ + ( :; $LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $LDFLAGS \ main.lo libctor.la -o main ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/ctor.at:62: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/ctor.at:63" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon $at_traceoff -echo "$at_srcdir/ctor.at:65: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/ctor.at:65: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo ctor.at:65 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/ctor.at:65: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/ctor.at:65" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-13 ) # Banner 13. early-libtool.at:25 - cat <<\_ATEOF - -libtool script generation. - -_ATEOF - ;; - - 57 ) # 57. early-libtool.at:32: config.status - at_setup_line='early-libtool.at:32' - at_desc="config.status" - $at_quiet $ECHO_N " 57: config.status $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_58 +#AT_START_59 +# 59. early-libtool.at:32: config.status +at_setup_line='early-libtool.at:32' +at_func_banner 13 +at_desc="config.status" +$at_quiet $as_echo_n " 59: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "57. early-libtool.at:32: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "59. early-libtool.at:32: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([libtool-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtool-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_MACRO_DIR([m4]) LT_INIT AC_CONFIG_FILES([Makefile]) @@ -21385,88 +15786,46 @@ $LIBTOOLIZE --copy --verbose --install $at_traceoff -echo "$at_srcdir/early-libtool.at:109: \$ACLOCAL -I m4" +$as_echo "$at_srcdir/early-libtool.at:109: \$ACLOCAL -I m4" echo early-libtool.at:109 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I m4"; then + ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:109: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:109" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/early-libtool.at:110: \$AUTOCONF --force" +$as_echo "$at_srcdir/early-libtool.at:110: \$AUTOCONF --force" echo early-libtool.at:110 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF --force" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF --force"; then + ( $at_traceon; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:110: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:110" +$at_failed && at_func_log_failure $at_traceon @@ -21474,235 +15833,143 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/early-libtool.at:111: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +$as_echo "$at_srcdir/early-libtool.at:111: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " echo early-libtool.at:111 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:111: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:111" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/early-libtool.at:112: \$MAKE " +$as_echo "$at_srcdir/early-libtool.at:112: \$MAKE " echo early-libtool.at:112 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE "; then + ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:112: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:112" +$at_failed && at_func_log_failure $at_traceon ) + + $at_traceoff -echo "$at_srcdir/early-libtool.at:114: ./hell; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/early-libtool.at:114: ./hell; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./hell\" || test -x \"./hell\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo early-libtool.at:114 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./hell; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./hell; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./hell" || test -x "./hell"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./hell; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./hell; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./hell" || test -x "./hell"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:114: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:114" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/early-libtool.at:115: grep 'Welcome to GNU Hell' stdout" +$as_echo "$at_srcdir/early-libtool.at:115: grep 'Welcome to GNU Hell' stdout" echo early-libtool.at:115 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'Welcome to GNU Hell' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'Welcome to GNU Hell' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'Welcome to GNU Hell' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'Welcome to GNU Hell' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:115: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:115" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/early-libtool.at:116: grep 'This is not GNU Hello.' stdout" -echo early-libtool.at:116 >"$at_check_line_file" +$as_echo "$at_srcdir/early-libtool.at:117: grep 'This is not GNU Hello.' stdout" +echo early-libtool.at:117 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'This is not GNU Hello.' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'This is not GNU Hello.' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'This is not GNU Hello.' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'This is not GNU Hello.' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:116: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:117" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 58 ) # 58. early-libtool.at:126: config.lt - at_setup_line='early-libtool.at:126' - at_desc="config.lt" - $at_quiet $ECHO_N " 58: config.lt $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_59 +#AT_START_60 +# 60. early-libtool.at:126: config.lt +at_setup_line='early-libtool.at:126' +at_func_banner 13 +at_desc="config.lt" +$at_quiet $as_echo_n " 60: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "58. early-libtool.at:126: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "60. early-libtool.at:126: testing ..." + $at_traceon cat >configure.ac <<'_ATEOF' -AC_INIT([libtool-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([libtool-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_MACRO_DIR([m4]) LT_INIT LT_OUTPUT @@ -21794,88 +16061,46 @@ $LIBTOOLIZE --copy --verbose --install $at_traceoff -echo "$at_srcdir/early-libtool.at:214: \$ACLOCAL -I m4" +$as_echo "$at_srcdir/early-libtool.at:214: \$ACLOCAL -I m4" echo early-libtool.at:214 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I m4"; then + ( $at_traceon; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:214: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:214" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/early-libtool.at:215: \$AUTOCONF --force" +$as_echo "$at_srcdir/early-libtool.at:215: \$AUTOCONF --force" echo early-libtool.at:215 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF --force" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF --force"; then + ( $at_traceon; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF --force ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:215: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:215" +$at_failed && at_func_log_failure $at_traceon @@ -21883,327 +16108,184 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/early-libtool.at:216: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " +$as_echo "$at_srcdir/early-libtool.at:216: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options " echo early-libtool.at:216 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options "; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:216: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:216" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/early-libtool.at:217: \$MAKE " +$as_echo "$at_srcdir/early-libtool.at:217: \$MAKE " echo early-libtool.at:217 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE "; then + ( $at_traceon; $MAKE ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:217: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:217" +$at_failed && at_func_log_failure $at_traceon ) + + $at_traceoff -echo "$at_srcdir/early-libtool.at:219: ./hell; lt_status=\$?; if test \$lt_status -eq 0; then :; +$as_echo "$at_srcdir/early-libtool.at:219: ./hell; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./hell\" || test -x \"./hell\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo early-libtool.at:219 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./hell; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./hell; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./hell" || test -x "./hell"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./hell; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./hell; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./hell" || test -x "./hell"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:219: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:219" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/early-libtool.at:220: grep 'Welcome to GNU Hell' stdout" +$as_echo "$at_srcdir/early-libtool.at:220: grep 'Welcome to GNU Hell' stdout" echo early-libtool.at:220 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'Welcome to GNU Hell' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'Welcome to GNU Hell' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'Welcome to GNU Hell' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'Welcome to GNU Hell' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:220: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:220" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/early-libtool.at:221: grep 'This is not GNU Hello.' stdout" +$as_echo "$at_srcdir/early-libtool.at:221: grep 'This is not GNU Hello.' stdout" echo early-libtool.at:221 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'This is not GNU Hello.' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'This is not GNU Hello.' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'This is not GNU Hello.' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'This is not GNU Hello.' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/early-libtool.at:221: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/early-libtool.at:221" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-14 ) # Banner 14. deplibs-ident.at:25 - cat <<\_ATEOF - -Detecting identical deplibs. - -_ATEOF - ;; - - 59 ) # 59. deplibs-ident.at:32: build tree relpaths - at_setup_line='deplibs-ident.at:32' - at_desc="build tree relpaths" - $at_quiet $ECHO_N " 59: build tree relpaths $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_60 +#AT_START_61 +# 61. deplibs-ident.at:32: build tree relpaths +at_setup_line='deplibs-ident.at:32' +at_func_banner 14 +at_desc="build tree relpaths" +$at_quiet $as_echo_n " 61: $at_desc " +at_xfail=no case $host in *-*-aix*|hppa*-*-hpux*|*-*-interix*|*-*-openbsd*) false;; *):;; esac && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "59. deplibs-ident.at:32: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "61. deplibs-ident.at:32: testing ..." + $at_traceon mkdir a a/b c echo 'int c() { return 0; }' > c/libcee.c $at_traceoff -echo "$at_srcdir/deplibs-ident.at:37: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c c/libcee.c -o c/libcee.lo" -echo deplibs-ident.at:37 >"$at_check_line_file" +$as_echo "$at_srcdir/deplibs-ident.at:38: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c c/libcee.c -o c/libcee.lo" +echo deplibs-ident.at:38 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c/libcee.c -o c/libcee.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c/libcee.c -o c/libcee.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c/libcee.c -o c/libcee.lo"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c/libcee.c -o c/libcee.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c/libcee.c -o c/libcee.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c/libcee.c -o c/libcee.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/deplibs-ident.at:37: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/deplibs-ident.at:38" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/deplibs-ident.at:39: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere" -echo deplibs-ident.at:39 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/deplibs-ident.at:40: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere" +echo deplibs-ident.at:40 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/deplibs-ident.at:39: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/deplibs-ident.at:40" +$at_failed && at_func_log_failure $at_traceon @@ -22217,85 +16299,43 @@ depl_3="-L../c -lcee" eval depend_on_c=\"\$depl_$i\" echo "extern int c(void); int a$i() { return c(); }" > liba$i.c $at_traceoff -echo "$at_srcdir/deplibs-ident.at:51: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c liba\$i.c" -echo deplibs-ident.at:51 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba$i.c" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/deplibs-ident.at:52: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c liba\$i.c" +echo deplibs-ident.at:52 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba$i.c ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba$i.c"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba$i.c ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba$i.c ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba$i.c ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/deplibs-ident.at:51: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/deplibs-ident.at:52" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/deplibs-ident.at:53: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba\$i.la liba\$i.lo \$depend_on_c -rpath /nowhere" -echo deplibs-ident.at:53 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la liba$i.lo $depend_on_c -rpath /nowhere" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/deplibs-ident.at:54: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o liba\$i.la liba\$i.lo \$depend_on_c -rpath /nowhere" +echo deplibs-ident.at:54 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la liba$i.lo $depend_on_c -rpath /nowhere ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la liba$i.lo $depend_on_c -rpath /nowhere"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la liba$i.lo $depend_on_c -rpath /nowhere ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la liba$i.lo $depend_on_c -rpath /nowhere ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la liba$i.lo $depend_on_c -rpath /nowhere ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/deplibs-ident.at:53: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/deplibs-ident.at:54" +$at_failed && at_func_log_failure $at_traceon done @@ -22310,159 +16350,88 @@ _ATEOF ( cd a/b $at_traceoff -echo "$at_srcdir/deplibs-ident.at:65: \$CC \$CFLAGS -c b.c" +$as_echo "$at_srcdir/deplibs-ident.at:65: \$CC \$CFLAGS -c b.c" echo deplibs-ident.at:65 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$CC $CFLAGS -c b.c" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $CC $CFLAGS -c b.c ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$CC $CFLAGS -c b.c"; then + ( $at_traceon; $CC $CFLAGS -c b.c ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $CC $CFLAGS -c b.c ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $CC $CFLAGS -c b.c ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/deplibs-ident.at:65: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/deplibs-ident.at:65" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/deplibs-ident.at:66: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o b b.\$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere" -echo deplibs-ident.at:66 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b b.$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/deplibs-ident.at:67: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o b b.\$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere" +echo deplibs-ident.at:67 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b b.$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b b.$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b b.$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b b.$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b b.$OBJEXT ../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/deplibs-ident.at:66: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/deplibs-ident.at:67" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/deplibs-ident.at:68: \$EGREP 'cee.*cee' stdout" +$as_echo "$at_srcdir/deplibs-ident.at:68: \$EGREP 'cee.*cee' stdout" echo deplibs-ident.at:68 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$EGREP 'cee.*cee' stdout" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $EGREP 'cee.*cee' stdout ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$EGREP 'cee.*cee' stdout"; then + ( $at_traceon; $EGREP 'cee.*cee' stdout ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $EGREP 'cee.*cee' stdout ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $EGREP 'cee.*cee' stdout ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/deplibs-ident.at:68: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/deplibs-ident.at:68" +$at_failed && at_func_log_failure $at_traceon ) - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-15 ) # Banner 15. configure-iface.at:25 - cat <<\_ATEOF - -configure interface to libltdl. - -_ATEOF - ;; - - 60 ) # 60. configure-iface.at:102: installable libltdl - at_setup_line='configure-iface.at:102' - at_desc="installable libltdl" - $at_quiet $ECHO_N " 60: installable libltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_61 +#AT_START_62 +# 62. configure-iface.at:102: installable libltdl +at_setup_line='configure-iface.at:102' +at_func_banner 15 +at_desc="installable libltdl" +$at_quiet $as_echo_n " 62: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOHEADER" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "60. configure-iface.at:102: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "62. configure-iface.at:102: testing ..." + $at_traceon @@ -22537,7 +16506,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([installable-ltdl-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([installable-ltdl-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_AUX_DIR([libltdl/config]) AC_CONFIG_MACRO_DIR([libltdl/m4]) AC_CONFIG_HEADERS([config.h:config.hin]) @@ -22576,212 +16545,113 @@ $LIBTOOLIZE --ltdl $at_traceoff -echo "$at_srcdir/configure-iface.at:141: \$ACLOCAL -I libltdl/m4" -echo configure-iface.at:141 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I libltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:142: \$ACLOCAL -I libltdl/m4" +echo configure-iface.at:142 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I libltdl/m4"; then + ( $at_traceon; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:141: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:142" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:141: \$AUTOHEADER " -echo configure-iface.at:141 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOHEADER " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:142: \$AUTOHEADER " +echo configure-iface.at:142 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOHEADER "; then + ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:141: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:142" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:141: \$AUTOMAKE --add-missing" -echo configure-iface.at:141 >"$at_check_line_file" +$as_echo "$at_srcdir/configure-iface.at:142: \$AUTOMAKE --add-missing" +echo configure-iface.at:142 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing"; then + ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:141: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:142" if $at_failed; then $at_traceoff -echo "$at_srcdir/configure-iface.at:141: grep 'require .*but have' stderr && (exit 77)" -echo configure-iface.at:141 >"$at_check_line_file" +$as_echo "$at_srcdir/configure-iface.at:142: grep 'require .*but have' stderr && (exit 77)" +echo configure-iface.at:142 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? -fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/configure-iface.at:141: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/configure-iface.at:142" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:141: \$AUTOCONF " -echo configure-iface.at:141 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:142: \$AUTOCONF " +echo configure-iface.at:142 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:141: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:142" +$at_failed && at_func_log_failure $at_traceon @@ -22789,88 +16659,46 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/configure-iface.at:141: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --with-included-ltdl --prefix=\$prefix" -echo configure-iface.at:141 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl --prefix=$prefix" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:142: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --with-included-ltdl --prefix=\$prefix" +echo configure-iface.at:142 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl --prefix=$prefix"; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:141: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:142" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/configure-iface.at:141: \$MAKE all install " -echo configure-iface.at:141 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all install " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:142: \$MAKE all install " +echo configure-iface.at:142 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all install "; then + ( $at_traceon; $MAKE all install ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all install ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:141: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:142" +$at_failed && at_func_log_failure $at_traceon ) @@ -22878,151 +16706,89 @@ $at_traceon # TODO: Check that the installed program `main' is linked against our libltdl $at_traceoff -echo "$at_srcdir/configure-iface.at:145: test -f \$prefix/lib/libltdl.la" +$as_echo "$at_srcdir/configure-iface.at:145: test -f \$prefix/lib/libltdl.la" echo configure-iface.at:145 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/lib/libltdl.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/lib/libltdl.la"; then + ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:145: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:145" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:146: test -f \$prefix/include/ltdl.h" +$as_echo "$at_srcdir/configure-iface.at:146: test -f \$prefix/include/ltdl.h" echo configure-iface.at:146 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/include/ltdl.h" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/include/ltdl.h"; then + ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:146: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:146" +$at_failed && at_func_log_failure $at_traceon # Check that main is rebuilt if libltdl.la is newer rm -f libltdl/libltdl.la $at_traceoff -echo "$at_srcdir/configure-iface.at:150: \$MAKE -q main\$EXEEXT || exit 1" +$as_echo "$at_srcdir/configure-iface.at:150: \$MAKE -q main\$EXEEXT || exit 1" echo configure-iface.at:150 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE -q main$EXEEXT || exit 1" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE -q main$EXEEXT || exit 1 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE -q main$EXEEXT || exit 1"; then + ( $at_traceon; $MAKE -q main$EXEEXT || exit 1 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE -q main$EXEEXT || exit 1 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE -q main$EXEEXT || exit 1 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/configure-iface.at:150: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/configure-iface.at:150" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 61 ) # 61. configure-iface.at:159: --with-ltdl-include/lib - at_setup_line='configure-iface.at:159' - at_desc="--with-ltdl-include/lib" - $at_quiet $ECHO_N " 61: --with-ltdl-include/lib $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_62 +#AT_START_63 +# 63. configure-iface.at:159: --with-ltdl-include/lib +at_setup_line='configure-iface.at:159' +at_func_banner 15 +at_desc="--with-ltdl-include/lib" +$at_quiet $as_echo_n " 63: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOHEADER" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "61. configure-iface.at:159: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "63. configure-iface.at:159: testing ..." + $at_traceon @@ -23036,88 +16802,46 @@ $LIBTOOLIZE --copy --ltdl=ltdl (cd ltdl ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/configure-iface.at:168: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" +$as_echo "$at_srcdir/configure-iface.at:168: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --enable-ltdl-install --prefix=\$prefix" echo configure-iface.at:168 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix"; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --enable-ltdl-install --prefix=$prefix ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:168: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:168" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/configure-iface.at:169: \$MAKE all install " +$as_echo "$at_srcdir/configure-iface.at:169: \$MAKE all install " echo configure-iface.at:169 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all install " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all install ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all install "; then + ( $at_traceon; $MAKE all install ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all install ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all install ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:169: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:169" +$at_failed && at_func_log_failure $at_traceon ) @@ -23127,85 +16851,43 @@ $at_traceon rm -rf ltdl/ $at_traceoff -echo "$at_srcdir/configure-iface.at:175: test -f \$prefix/lib/libltdl.la" +$as_echo "$at_srcdir/configure-iface.at:175: test -f \$prefix/lib/libltdl.la" echo configure-iface.at:175 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/lib/libltdl.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/lib/libltdl.la"; then + ( $at_traceon; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/lib/libltdl.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:175: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:175" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:176: test -f \$prefix/include/ltdl.h" +$as_echo "$at_srcdir/configure-iface.at:176: test -f \$prefix/include/ltdl.h" echo configure-iface.at:176 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "test -f $prefix/include/ltdl.h" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" -else - ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" - at_status=$? +if test -n "$at_traceon" \ + && at_func_check_newline "test -f $prefix/include/ltdl.h"; then + ( $at_traceon; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; test -f $prefix/include/ltdl.h ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:176: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:176" +$at_failed && at_func_log_failure $at_traceon @@ -23280,7 +16962,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([configure-iface-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([configure-iface-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_MACRO_DIR([_inst/aclocal]) AC_CONFIG_HEADERS([config.h:config.hin]) AM_INIT_AUTOMAKE([foreign]) @@ -23314,212 +16996,113 @@ $LIBTOOLIZE $at_traceoff -echo "$at_srcdir/configure-iface.at:209: \$ACLOCAL -I _inst/aclocal" -echo configure-iface.at:209 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I _inst/aclocal" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:211: \$ACLOCAL -I _inst/aclocal" +echo configure-iface.at:211 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I _inst/aclocal ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I _inst/aclocal"; then + ( $at_traceon; $ACLOCAL -I _inst/aclocal ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I _inst/aclocal ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I _inst/aclocal ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:209: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:211" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:209: \$AUTOHEADER " -echo configure-iface.at:209 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOHEADER " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:211: \$AUTOHEADER " +echo configure-iface.at:211 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOHEADER "; then + ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:209: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:211" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:209: \$AUTOMAKE --add-missing" -echo configure-iface.at:209 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:211: \$AUTOMAKE --add-missing" +echo configure-iface.at:211 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing"; then + ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:209: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:211" if $at_failed; then $at_traceoff -echo "$at_srcdir/configure-iface.at:209: grep 'require .*but have' stderr && (exit 77)" -echo configure-iface.at:209 >"$at_check_line_file" +$as_echo "$at_srcdir/configure-iface.at:211: grep 'require .*but have' stderr && (exit 77)" +echo configure-iface.at:211 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/configure-iface.at:209: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/configure-iface.at:211" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:209: \$AUTOCONF " -echo configure-iface.at:209 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:211: \$AUTOCONF " +echo configure-iface.at:211 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:209: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:211" +$at_failed && at_func_log_failure $at_traceon @@ -23527,88 +17110,46 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/configure-iface.at:209: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --with-ltdl-lib=\$prefix/lib --with-ltdl-include=\$prefix/include" -echo configure-iface.at:209 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-ltdl-lib=$prefix/lib --with-ltdl-include=$prefix/include" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:211: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --with-ltdl-lib=\$prefix/lib --with-ltdl-include=\$prefix/include" +echo configure-iface.at:211 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-ltdl-lib=$prefix/lib --with-ltdl-include=$prefix/include ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-ltdl-lib=$prefix/lib --with-ltdl-include=$prefix/include"; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-ltdl-lib=$prefix/lib --with-ltdl-include=$prefix/include ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-ltdl-lib=$prefix/lib --with-ltdl-include=$prefix/include ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-ltdl-lib=$prefix/lib --with-ltdl-include=$prefix/include ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:209: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:211" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/configure-iface.at:209: \$MAKE all " -echo configure-iface.at:209 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:211: \$MAKE all " +echo configure-iface.at:211 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all "; then + ( $at_traceon; $MAKE all ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:209: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:211" +$at_failed && at_func_log_failure $at_traceon ) @@ -23617,76 +17158,65 @@ $at_traceon ## TODO: portable ldd check for correct libltdl ## Currently, this test doesn't fail if `main' ends up linking against a ## previously installed system libltdl. +case $host_os in mingw*) + while read -r l; do printf "%s\r\n" "$l"; done < expout > expout.t + mv -f expout.t expout ;; +esac + $at_traceoff -echo "$at_srcdir/configure-iface.at:216: \$LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=\$?; +$as_echo "$at_srcdir/configure-iface.at:216: \$LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo configure-iface.at:216 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=$?; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=$?; + ( :; $LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:216: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:216" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 62 ) # 62. configure-iface.at:225: --with-included-ltdl - at_setup_line='configure-iface.at:225' - at_desc="--with-included-ltdl" - $at_quiet $ECHO_N " 62: --with-included-ltdl $ECHO_C" - at_xfail=no + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_63 +#AT_START_64 +# 64. configure-iface.at:225: --with-included-ltdl +at_setup_line='configure-iface.at:225' +at_func_banner 15 +at_desc="--with-included-ltdl" +$at_quiet $as_echo_n " 64: $at_desc " +at_xfail=no test "$ACLOCAL" = no && at_xfail=yes test "$AUTOHEADER" = no && at_xfail=yes test "$AUTOMAKE" = no && at_xfail=yes test "$AUTOCONF" = no && at_xfail=yes - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "62. configure-iface.at:225: testing ..." - $at_traceon +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "64. configure-iface.at:225: testing ..." + $at_traceon @@ -23761,7 +17291,7 @@ _ATEOF cat >configure.ac <<'_ATEOF' -AC_INIT([configure-iface-demo], 2.2, bug-libtool@gnu.org) +AC_INIT([configure-iface-demo], 2.2.2, bug-libtool@gnu.org) AC_CONFIG_AUX_DIR([libltdl/config]) AC_CONFIG_MACRO_DIR([libltdl/m4]) AC_CONFIG_HEADERS([config.h:config.hin]) @@ -23797,212 +17327,113 @@ $LIBTOOLIZE --ltdl $at_traceoff -echo "$at_srcdir/configure-iface.at:261: \$ACLOCAL -I libltdl/m4" -echo configure-iface.at:261 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$ACLOCAL -I libltdl/m4" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:262: \$ACLOCAL -I libltdl/m4" +echo configure-iface.at:262 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$ACLOCAL -I libltdl/m4"; then + ( $at_traceon; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $ACLOCAL -I libltdl/m4 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:261: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:262" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:261: \$AUTOHEADER " -echo configure-iface.at:261 >"$at_check_line_file" +$as_echo "$at_srcdir/configure-iface.at:262: \$AUTOHEADER " +echo configure-iface.at:262 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOHEADER " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOHEADER "; then + ( $at_traceon; $AUTOHEADER ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOHEADER ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:261: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:262" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:261: \$AUTOMAKE --add-missing" -echo configure-iface.at:261 >"$at_check_line_file" +$as_echo "$at_srcdir/configure-iface.at:262: \$AUTOMAKE --add-missing" +echo configure-iface.at:262 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOMAKE --add-missing" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOMAKE --add-missing"; then + ( $at_traceon; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOMAKE --add-missing ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; tee stderr <"$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:261: exit code was $at_status, expected 0" - at_failed=:;; -esac +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:262" if $at_failed; then $at_traceoff -echo "$at_srcdir/configure-iface.at:261: grep 'require .*but have' stderr && (exit 77)" -echo configure-iface.at:261 >"$at_check_line_file" +$as_echo "$at_srcdir/configure-iface.at:262: grep 'require .*but have' stderr && (exit 77)" +echo configure-iface.at:262 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; grep 'require .*but have' stderr && (exit 77) ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/configure-iface.at:261: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 1 $at_status "$at_srcdir/configure-iface.at:262" +$at_failed && at_func_log_failure $at_traceon - - echo 1 > "$at_status_file" - exit 1 fi +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/configure-iface.at:261: \$AUTOCONF " -echo configure-iface.at:261 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$AUTOCONF " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/configure-iface.at:262: \$AUTOCONF " +echo configure-iface.at:262 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$AUTOCONF "; then + ( $at_traceon; $AUTOCONF ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $AUTOCONF ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:261: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:262" +$at_failed && at_func_log_failure $at_traceon @@ -24010,88 +17441,46 @@ $at_traceon ( SHELL=${CONFIG_SHELL-/bin/sh} $at_traceoff -echo "$at_srcdir/configure-iface.at:261: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --with-included-ltdl" -echo configure-iface.at:261 >"$at_check_line_file" +$as_echo "$at_srcdir/configure-iface.at:262: CONFIG_SHELL=\$SHELL \$SHELL ./configure \$configure_options --with-included-ltdl" +echo configure-iface.at:262 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl"; then + ( $at_traceon; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options --with-included-ltdl ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:261: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:262" +$at_failed && at_func_log_failure $at_traceon ) ( $unset LIBTOOL LIBTOOLIZE $at_traceoff -echo "$at_srcdir/configure-iface.at:261: \$MAKE all " -echo configure-iface.at:261 >"$at_check_line_file" +$as_echo "$at_srcdir/configure-iface.at:262: \$MAKE all " +echo configure-iface.at:262 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE all " in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE all ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE all "; then + ( $at_traceon; $MAKE all ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE all ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE all ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:261: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:262" +$at_failed && at_func_log_failure $at_traceon ) @@ -24099,93 +17488,63 @@ $at_traceon # --with-included-ltdl should build a convenience lib by default $at_traceoff -echo "$at_srcdir/configure-iface.at:265: test -f libltdl/libltdlc.la" +$as_echo "$at_srcdir/configure-iface.at:265: test -f libltdl/libltdlc.la" echo configure-iface.at:265 >"$at_check_line_file" -at_trace_this= if test -n "$at_traceon"; then - at_trace_this=yes -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; test -f libltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + ( $at_traceon; test -f libltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; test -f libltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; test -f libltdl/libltdlc.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:265: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:265" +$at_failed && at_func_log_failure $at_traceon ## TODO: portable ldd check for correct libltdl ## Currently, this test doesn't fail if `main' ends up linking against a ## previously installed system libltdl. +case $host_os in mingw*) + while read -r l; do printf "%s\r\n" "$l"; done < expout > expout.t + mv -f expout.t expout ;; +esac + $at_traceoff -echo "$at_srcdir/configure-iface.at:270: \$LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=\$?; +$as_echo "$at_srcdir/configure-iface.at:270: \$LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo configure-iface.at:270 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=$?; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; $LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=$?; + ( :; $LIBTOOL --mode=execute -dlopen libmodule.la ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stderr" || at_failed=: $at_diff expout "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/configure-iface.at:270: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/configure-iface.at:270" +$at_failed && at_func_log_failure $at_traceon @@ -24193,71 +17552,42 @@ $at_traceon # Check that main is rebuilt if libltdlc.la is newer rm -f libltdl/libltdlc.la $at_traceoff -echo "$at_srcdir/configure-iface.at:274: \$MAKE -q main\$EXEEXT || exit 1" +$as_echo "$at_srcdir/configure-iface.at:274: \$MAKE -q main\$EXEEXT || exit 1" echo configure-iface.at:274 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$MAKE -q main$EXEEXT || exit 1" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $MAKE -q main$EXEEXT || exit 1 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$MAKE -q main$EXEEXT || exit 1"; then + ( $at_traceon; $MAKE -q main$EXEEXT || exit 1 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $MAKE -q main$EXEEXT || exit 1 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $MAKE -q main$EXEEXT || exit 1 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 1) ;; - *) echo "$at_srcdir/configure-iface.at:274: exit code was $at_status, expected 1" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 1 $at_status "$at_srcdir/configure-iface.at:274" +$at_failed && at_func_log_failure $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - banner-16 ) # Banner 16. stresstest.at:30 - cat <<\_ATEOF - -Libtool stress test. - -_ATEOF - ;; - - 63 ) # 63. stresstest.at:31: Link option thorough search test - at_setup_line='stresstest.at:31' - at_desc="Link option thorough search test" - $at_quiet $ECHO_N " 63: Link option thorough search test $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "63. stresstest.at:31: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_64 +#AT_START_65 +# 65. stresstest.at:31: Link option thorough search test +at_setup_line='stresstest.at:31' +at_func_banner 16 +at_desc="Link option thorough search test" +$at_quiet $as_echo_n " 65: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "65. stresstest.at:31: testing ..." + $at_traceon eval `$LIBTOOL --config | $EGREP '^(CC|objdir|allow_undefined_flag)='` @@ -24455,249 +17785,123 @@ _ATEOF $at_traceoff -echo "$at_srcdir/stresstest.at:221: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c a.c -o sub/a.lo" -echo stresstest.at:221 >"$at_check_line_file" +$as_echo "$at_srcdir/stresstest.at:222: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c a.c -o sub/a.lo" +echo stresstest.at:222 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c -o sub/a.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c -o sub/a.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c -o sub/a.lo"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c -o sub/a.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c -o sub/a.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c -o sub/a.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:221: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:222" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/stresstest.at:223: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c b.c -o sub/b.lo" -echo stresstest.at:223 >"$at_check_line_file" +$as_echo "$at_srcdir/stresstest.at:224: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c b.c -o sub/b.lo" +echo stresstest.at:224 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c b.c -o sub/b.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c b.c -o sub/b.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c b.c -o sub/b.lo"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c b.c -o sub/b.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c b.c -o sub/b.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c b.c -o sub/b.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:223: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:224" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/stresstest.at:225: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS -DLIBA_DLL_IMPORT \$CFLAGS -c main.c" -echo stresstest.at:225 >"$at_check_line_file" +$as_echo "$at_srcdir/stresstest.at:226: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS -DLIBA_DLL_IMPORT \$CFLAGS -c main.c" +echo stresstest.at:226 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c main.c ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:225: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:226" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/stresstest.at:227: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c main.c -o main-static.lo" -echo stresstest.at:227 >"$at_check_line_file" +$as_echo "$at_srcdir/stresstest.at:228: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c main.c -o main-static.lo" +echo stresstest.at:228 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main.c -o main-static.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main.c -o main-static.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main.c -o main-static.lo"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main.c -o main-static.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main.c -o main-static.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main.c -o main-static.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:227: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:228" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/stresstest.at:229: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS -DLIBA_DLL_IMPORT \$CFLAGS -c dlself.c -o sub3/dlself.lo" -echo stresstest.at:229 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c dlself.c -o sub3/dlself.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/stresstest.at:230: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS -DLIBA_DLL_IMPORT \$CFLAGS -c dlself.c -o sub3/dlself.lo" +echo stresstest.at:230 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c dlself.c -o sub3/dlself.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c dlself.c -o sub3/dlself.lo"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c dlself.c -o sub3/dlself.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c dlself.c -o sub3/dlself.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS -DLIBA_DLL_IMPORT $CFLAGS -c dlself.c -o sub3/dlself.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:229: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:230" +$at_failed && at_func_log_failure $at_traceon $at_traceoff -echo "$at_srcdir/stresstest.at:231: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c dlself.c -o sub3/dlself-static.lo" -echo stresstest.at:231 >"$at_check_line_file" +$as_echo "$at_srcdir/stresstest.at:232: \$LIBTOOL --mode=compile \$CC \$CPPFLAGS \$CFLAGS -c dlself.c -o sub3/dlself-static.lo" +echo stresstest.at:232 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c dlself.c -o sub3/dlself-static.lo" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c dlself.c -o sub3/dlself-static.lo ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c dlself.c -o sub3/dlself-static.lo"; then + ( $at_traceon; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c dlself.c -o sub3/dlself-static.lo ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c dlself.c -o sub3/dlself-static.lo ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c dlself.c -o sub3/dlself-static.lo ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:231: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:232" +$at_failed && at_func_log_failure $at_traceon @@ -24719,44 +17923,23 @@ do for rel in '' ./ `pwd`/ do echo "eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o \"$rel\"sub2/liba.la \"$rel\"sub/a.lo' $linkargs"; $at_traceoff -echo "$at_srcdir/stresstest.at:251: eval '\$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o \"\$rel\"sub2/liba.la \"\$rel\"sub/a.lo' \$linkargs" -echo stresstest.at:251 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o \"$rel\"sub2/liba.la \"$rel\"sub/a.lo' $linkargs" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/stresstest.at:252: eval '\$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS -o \"\$rel\"sub2/liba.la \"\$rel\"sub/a.lo' \$linkargs" +echo stresstest.at:252 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o "$rel"sub2/liba.la "$rel"sub/a.lo' $linkargs ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o \"$rel\"sub2/liba.la \"$rel\"sub/a.lo' $linkargs"; then + ( $at_traceon; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o "$rel"sub2/liba.la "$rel"sub/a.lo' $linkargs ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o "$rel"sub2/liba.la "$rel"sub/a.lo' $linkargs ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o "$rel"sub2/liba.la "$rel"sub/a.lo' $linkargs ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:251: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:252" +$at_failed && at_func_log_failure $at_traceon for st in '' '-static' '-no-install' @@ -24767,180 +17950,108 @@ $at_traceon esac echo "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o \"$rel\"main \"$rel\"main$mst.lo \"$rel\"sub2/liba.la"; $at_traceoff -echo "$at_srcdir/stresstest.at:260: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$st -o \"\$rel\"main \"\$rel\"main\$mst.lo \"\$rel\"sub2/liba.la" -echo stresstest.at:260 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o \"$rel\"main \"$rel\"main$mst.lo \"$rel\"sub2/liba.la" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/stresstest.at:261: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$st -o \"\$rel\"main \"\$rel\"main\$mst.lo \"\$rel\"sub2/liba.la" +echo stresstest.at:261 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"main "$rel"main$mst.lo "$rel"sub2/liba.la ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o \"$rel\"main \"$rel\"main$mst.lo \"$rel\"sub2/liba.la"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"main "$rel"main$mst.lo "$rel"sub2/liba.la ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"main "$rel"main$mst.lo "$rel"sub2/liba.la ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"main "$rel"main$mst.lo "$rel"sub2/liba.la ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:260: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:261" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/stresstest.at:262: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/stresstest.at:262: ./main; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./main\" || test -x \"./main\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo stresstest.at:262 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./main; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./main" || test -x "./main"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:262: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:262" +$at_failed && at_func_log_failure $at_traceon for l10 in '' '-export-symbols dlselfsyms' do echo "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o \"$rel\"sub3/dlself \"$rel\"sub3/dlself$mst.lo \"$rel\"sub2/liba.la sub/b.lo -dlopen self $l10"; $at_traceoff -echo "$at_srcdir/stresstest.at:265: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$st -o \"\$rel\"sub3/dlself \"\$rel\"sub3/dlself\$mst.lo \"\$rel\"sub2/liba.la sub/b.lo -dlopen self \$l10" -echo stresstest.at:265 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o \"$rel\"sub3/dlself \"$rel\"sub3/dlself$mst.lo \"$rel\"sub2/liba.la sub/b.lo -dlopen self $l10" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/stresstest.at:266: \$LIBTOOL --mode=link \$CC \$CFLAGS \$LDFLAGS \$st -o \"\$rel\"sub3/dlself \"\$rel\"sub3/dlself\$mst.lo \"\$rel\"sub2/liba.la sub/b.lo -dlopen self \$l10" +echo stresstest.at:266 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"sub3/dlself "$rel"sub3/dlself$mst.lo "$rel"sub2/liba.la sub/b.lo -dlopen self $l10 ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o \"$rel\"sub3/dlself \"$rel\"sub3/dlself$mst.lo \"$rel\"sub2/liba.la sub/b.lo -dlopen self $l10"; then + ( $at_traceon; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"sub3/dlself "$rel"sub3/dlself$mst.lo "$rel"sub2/liba.la sub/b.lo -dlopen self $l10 ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"sub3/dlself "$rel"sub3/dlself$mst.lo "$rel"sub2/liba.la sub/b.lo -dlopen self $l10 ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"sub3/dlself "$rel"sub3/dlself$mst.lo "$rel"sub2/liba.la sub/b.lo -dlopen self $l10 ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:265: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:266" +$at_failed && at_func_log_failure +$at_traceon - echo 1 > "$at_status_file" - exit 1 -fi -$at_traceon - $at_traceoff -echo "$at_srcdir/stresstest.at:267: ./sub3/dlself; lt_status=\$?; if test \$lt_status -eq 0; then :; +$at_traceoff +$as_echo "$at_srcdir/stresstest.at:267: ./sub3/dlself; lt_status=\$?; if test \$lt_status -eq 0; then :; elif test \"X\$host\" != \"X\$build\" && \\ { test -x \"./sub3/dlself\" || test -x \"./sub3/dlself\"\$EXEEXT; } then (exit 77); else (exit \$lt_status); fi" echo stresstest.at:267 >"$at_check_line_file" -at_trace_this= -if test -n "$at_traceon"; then - echo 'Not enabling shell tracing (command contains an embedded newline)' -fi - -if test -n "$at_trace_this"; then - ( $at_traceon; ./sub3/dlself; lt_status=$?; if test $lt_status -eq 0; then :; +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; ./sub3/dlself; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub3/dlself" || test -x "./sub3/dlself"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" + at_func_filter_trace $? else - ( :; ./sub3/dlself; lt_status=$?; if test $lt_status -eq 0; then :; + ( :; ./sub3/dlself; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "./sub3/dlself" || test -x "./sub3/dlself"$EXEEXT; } then (exit 77); else (exit $lt_status); fi ) >"$at_stdout" 2>"$at_stderr" - at_status=$? fi - +at_status=$? at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: -$at_diff "$at_devnull" "$at_stdout" || at_failed=: -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/stresstest.at:267: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - - echo 1 > "$at_status_file" - exit 1 -fi +at_func_diff_devnull "$at_stderr" || at_failed=: +at_func_diff_devnull "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/stresstest.at:267" +$at_failed && at_func_log_failure $at_traceon @@ -24951,21 +18062,22 @@ $at_traceon done done - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - 64 ) # 64. cmdline_wrap.at:28: Run tests with low max_cmd_len - at_setup_line='cmdline_wrap.at:28' - at_desc="Run tests with low max_cmd_len" - $at_quiet $ECHO_N " 64: Run tests with low max_cmd_len $ECHO_C" - at_xfail=no - echo "# -*- compilation -*-" >> "$at_group_log" - ( - echo "64. cmdline_wrap.at:28: testing ..." - $at_traceon + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_65 +#AT_START_66 +# 66. cmdline_wrap.at:28: Run tests with low max_cmd_len +at_setup_line='cmdline_wrap.at:28' +at_func_banner 16 +at_desc="Run tests with low max_cmd_len" +$at_quiet $as_echo_n " 66: $at_desc " +at_xfail=no +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "66. cmdline_wrap.at:28: testing ..." + $at_traceon @@ -24981,357 +18093,29 @@ cd tests INNER_TESTSUITEFLAGS="$INNER_TESTSUITEFLAGS abs_top_srcdir=$abs_top_srcdir \ abs_builddir=$abs_builddir" $at_traceoff -echo "$at_srcdir/cmdline_wrap.at:43: \$CONFIG_SHELL \$abs_srcdir/testsuite -k libtool \$INNER_TESTSUITEFLAGS" -echo cmdline_wrap.at:43 >"$at_check_line_file" - -at_trace_this= -if test -n "$at_traceon"; then - case "$CONFIG_SHELL $abs_srcdir/testsuite -k libtool $INNER_TESTSUITEFLAGS" in - *' -'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;; - *) at_trace_this=yes ;; - esac -fi +$as_echo "$at_srcdir/cmdline_wrap.at:44: \$CONFIG_SHELL \$abs_srcdir/testsuite -k libtool \$INNER_TESTSUITEFLAGS" +echo cmdline_wrap.at:44 >"$at_check_line_file" -if test -n "$at_trace_this"; then - ( $at_traceon; $CONFIG_SHELL $abs_srcdir/testsuite -k libtool $INNER_TESTSUITEFLAGS ) >"$at_stdout" 2>"$at_stder1" - at_status=$? - grep '^ *+' "$at_stder1" >&2 - grep -v '^ *+' "$at_stder1" >"$at_stderr" +if test -n "$at_traceon" \ + && at_func_check_newline "$CONFIG_SHELL $abs_srcdir/testsuite -k libtool $INNER_TESTSUITEFLAGS"; then + ( $at_traceon; $CONFIG_SHELL $abs_srcdir/testsuite -k libtool $INNER_TESTSUITEFLAGS ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? else - ( :; $CONFIG_SHELL $abs_srcdir/testsuite -k libtool $INNER_TESTSUITEFLAGS ) >"$at_stdout" 2>"$at_stderr" - at_status=$? + ( :; $CONFIG_SHELL $abs_srcdir/testsuite -k libtool $INNER_TESTSUITEFLAGS ) >"$at_stdout" 2>"$at_stderr" fi - +at_status=$? at_failed=false echo stderr:; cat "$at_stderr" echo stdout:; cat "$at_stdout" -case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; - 0) ;; - *) echo "$at_srcdir/cmdline_wrap.at:43: exit code was $at_status, expected 0" - at_failed=:;; -esac -if $at_failed; then - - for file in "testsuite.log" - do echo "$file:"; sed 's/^/> /' "$file"; done - echo 1 > "$at_status_file" - exit 1 -fi +at_func_check_status 0 $at_status "$at_srcdir/cmdline_wrap.at:44" +$at_failed && at_func_log_failure \ +"testsuite.log" $at_traceon - $at_traceoff - $at_times_p && times >"$at_times_file" - ) 5>&1 2>&1 | eval $at_tee_pipe - at_status=`cat "$at_status_file"` - ;; - - - * ) - echo "$as_me: no such test group: $at_group" >&2 - continue - ;; - esac - - # Be sure to come back to the suite directory, in particular - # since below we might `rm' the group directory we are in currently. - cd "$at_suite_dir" - - case $at_group in - banner-*) ;; - *) - if test ! -f "$at_check_line_file"; then - sed "s/^ */$as_me: warning: /" <<_ATEOF - A failure happened in a test group before any test could be - run. This means that test suite is improperly designed. Please - report this failure to . -_ATEOF - echo "$at_setup_line" >"$at_check_line_file" - fi - at_group_count=`expr 1 + $at_group_count` - $at_verbose $ECHO_N "$at_group. $at_setup_line: $ECHO_C" - echo $ECHO_N "$at_group. $at_setup_line: $ECHO_C" >> "$at_group_log" - case $at_xfail:$at_status in - yes:0) - at_msg="UNEXPECTED PASS" - at_xpass_list="$at_xpass_list $at_group" - at_errexit=$at_errexit_p - ;; - no:0) - at_msg="ok" - at_pass_list="$at_pass_list $at_group" - at_errexit=false - ;; - *:77) - at_msg='skipped ('`cat "$at_check_line_file"`')' - at_skip_list="$at_skip_list $at_group" - at_errexit=false - ;; - yes:*) - at_msg='expected failure ('`cat "$at_check_line_file"`')' - at_xfail_list="$at_xfail_list $at_group" - at_errexit=false - ;; - no:*) - at_msg='FAILED ('`cat "$at_check_line_file"`')' - at_fail_list="$at_fail_list $at_group" - at_errexit=$at_errexit_p - ;; - esac - # Make sure there is a separator even with long titles. - echo " $at_msg" - at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg" - case $at_status in - 0|77) - # $at_times_file is only available if the group succeeded. - # We're not including the group log, so the success message - # is written in the global log separately. But we also - # write to the group log in case they're using -d. - if test -f "$at_times_file"; then - at_log_msg="$at_log_msg ("`sed 1d "$at_times_file"`')' - rm -f "$at_times_file" - fi - echo "$at_log_msg" >> "$at_group_log" - echo "$at_log_msg" >&5 - - # Cleanup the group directory, unless the user wants the files. - if $at_debug_p ; then - { - echo "#! /bin/sh" - echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' - echo "cd '$at_dir'" - echo 'exec ${CONFIG_SHELL-'"$SHELL"'}' "$0" \ - '-v -d' "$at_debug_args" "$at_group" '${1+"$@"}' - echo 'exit 1' - } >$at_group_dir/run - chmod +x $at_group_dir/run - - elif test -d "$at_group_dir"; then - find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \; - rm -fr "$at_group_dir" - fi - ;; - *) - # Upon failure, include the log into the testsuite's global - # log. The failure message is written in the group log. It - # is later included in the global log. - echo "$at_log_msg" >> "$at_group_log" - - # Upon failure, keep the group directory for autopsy, and - # create the debugging script. - { - echo "#! /bin/sh" - echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' - echo "cd '$at_dir'" - echo 'exec ${CONFIG_SHELL-'"$SHELL"'}' "$0" \ - '-v -d' "$at_debug_args" "$at_group" '${1+"$@"}' - echo 'exit 1' - } >$at_group_dir/run - chmod +x $at_group_dir/run - - $at_errexit && break - ;; - esac - ;; - esac -done - -# Back to the top directory. -cd "$at_dir" - -# Compute the duration of the suite. -at_stop_date=`date` -at_stop_time=`date +%s 2>/dev/null` -echo "$as_me: ending at: $at_stop_date" >&5 -case $at_start_time,$at_stop_time in - [0-9]*,[0-9]*) - at_duration_s=`expr $at_stop_time - $at_start_time` - at_duration_m=`expr $at_duration_s / 60` - at_duration_h=`expr $at_duration_m / 60` - at_duration_s=`expr $at_duration_s % 60` - at_duration_m=`expr $at_duration_m % 60` - at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s" - echo "$as_me: test suite duration: $at_duration" >&5 - ;; -esac - -# Wrap up the test suite with summary statistics. -at_skip_count=`set dummy $at_skip_list; shift; echo $#` -at_fail_count=`set dummy $at_fail_list; shift; echo $#` -at_xpass_count=`set dummy $at_xpass_list; shift; echo $#` -at_xfail_count=`set dummy $at_xfail_list; shift; echo $#` - -at_run_count=`expr $at_group_count - $at_skip_count` -at_unexpected_count=`expr $at_xpass_count + $at_fail_count` -at_total_fail_count=`expr $at_xfail_count + $at_fail_count` - -echo -cat <<\_ASBOX -## ------------- ## -## Test results. ## -## ------------- ## -_ASBOX -echo -{ - echo - cat <<\_ASBOX -## ------------- ## -## Test results. ## -## ------------- ## -_ASBOX - echo -} >&5 - -if test $at_run_count = 1; then - at_result="1 test" - at_were=was -else - at_result="$at_run_count tests" - at_were=were -fi -if $at_errexit_p && test $at_unexpected_count != 0; then - if test $at_xpass_count = 1; then - at_result="$at_result $at_were run, one passed" - else - at_result="$at_result $at_were run, one failed" - fi - at_result="$at_result unexpectedly and inhibited subsequent tests." -else - # Don't you just love exponential explosion of the number of cases? - case $at_xpass_count:$at_fail_count:$at_xfail_count in - # So far, so good. - 0:0:0) at_result="$at_result $at_were successful." ;; - 0:0:*) at_result="$at_result behaved as expected." ;; - - # Some unexpected failures - 0:*:0) at_result="$at_result $at_were run, -$at_fail_count failed unexpectedly." ;; - - # Some failures, both expected and unexpected - 0:*:1) at_result="$at_result $at_were run, -$at_total_fail_count failed ($at_xfail_count expected failure)." ;; - 0:*:*) at_result="$at_result $at_were run, -$at_total_fail_count failed ($at_xfail_count expected failures)." ;; - - # No unexpected failures, but some xpasses - *:0:*) at_result="$at_result $at_were run, -$at_xpass_count passed unexpectedly." ;; - - # No expected failures, but failures and xpasses - *:1:0) at_result="$at_result $at_were run, -$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;; - *:*:0) at_result="$at_result $at_were run, -$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;; - - # All of them. - *:*:1) at_result="$at_result $at_were run, -$at_xpass_count passed unexpectedly, -$at_total_fail_count failed ($at_xfail_count expected failure)." ;; - *:*:*) at_result="$at_result $at_were run, -$at_xpass_count passed unexpectedly, -$at_total_fail_count failed ($at_xfail_count expected failures)." ;; - esac - - if test $at_skip_count = 0 && test $at_run_count -gt 1; then - at_result="All $at_result" - fi -fi - -# Now put skips in the mix. -case $at_skip_count in - 0) ;; - 1) at_result="$at_result -1 test was skipped." ;; - *) at_result="$at_result -$at_skip_count tests were skipped." ;; -esac - -if test $at_unexpected_count = 0; then - echo "$at_result" - echo "$at_result" >&5 -else - echo "ERROR: $at_result" >&2 - echo "ERROR: $at_result" >&5 - { - echo - cat <<\_ASBOX -## ------------------------ ## -## Summary of the failures. ## -## ------------------------ ## -_ASBOX - - # Summary of failed and skipped tests. - if test $at_fail_count != 0; then - echo "Failed tests:" - $SHELL "$0" $at_fail_list --list - echo - fi - if test $at_skip_count != 0; then - echo "Skipped tests:" - $SHELL "$0" $at_skip_list --list - echo - fi - if test $at_xpass_count != 0; then - echo "Unexpected passes:" - $SHELL "$0" $at_xpass_list --list - echo - fi - if test $at_fail_count != 0; then - cat <<\_ASBOX -## ---------------------- ## -## Detailed failed tests. ## -## ---------------------- ## -_ASBOX - echo - for at_group in $at_fail_list - do - at_group_normalized=$at_group - - while :; do - case $at_group_normalized in #( - $at_format*) break;; - esac - at_group_normalized=0$at_group_normalized - done - - cat "$at_suite_dir/$at_group_normalized/$as_me.log" - echo - done - echo - fi - if test -n "$at_top_srcdir"; then - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## ${at_top_build_prefix}config.log ## -_ASBOX - sed 's/^/| /' ${at_top_build_prefix}config.log - echo - fi - } >&5 - - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## $as_me.log was created. ## -_ASBOX - - echo - echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:" - echo - echo " To: " - echo " Subject: [libtool 2.2] $as_me:$at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}$at_xpass_list${at_xpass_list:+ passed unexpectedly}" - echo - if test $at_debug_p = false; then - echo - echo 'You may investigate any problem if you feel able to do so, in which' - echo 'case the test suite provides a good starting point. Its output may' - echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'." - echo - fi - exit 1 -fi - -exit 0 - - - + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_66 diff -ruNp libtool-2.2/tests/testsuite.at libtool-2.2.2/tests/testsuite.at --- libtool-2.2/tests/testsuite.at 2008-02-12 04:36:45.000000000 -0500 +++ libtool-2.2.2/tests/testsuite.at 2008-04-01 14:06:10.000000000 -0400 @@ -35,10 +35,13 @@ for tool in ACLOCAL AUTOHEADER AUTOCONF done export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF eval `$LIBTOOL --config | grep '^EGREP='` -eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|ECHO)='` +eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|build_alias|ECHO)='` configure_options= if test -n "$host_alias"; then - configure_options="--host $host_alias" + configure_options="$configure_options --host $host_alias" +fi +if test -n "$build_alias"; then + configure_options="$configure_options --build $build_alias" fi if (FOO=bar; unset FOO) >/dev/null 2>&1; then unset=unset @@ -57,10 +60,22 @@ AT_KEYWORDS([libtoolize]) ]) +# _LIBTOOLIZE_TRANSFORM(FILE) +# --------------------------- +# Fix the expected output of installed libtoolize in presence of --program-*. +m4_define([_LIBTOOLIZE_TRANSFORM], +[lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: '' +sed "s/^libtoolize/$lt_name/" < $1 > $1.t +mv -f $1.t $1 +])dnl + + # LT_AT_CHECK_LIBTOOLIZE(ARGS, [EXIT-STATUS = 0], [STDOUT = `'], [STDERR = `']) # ----------------------------------------------------------------------------- m4_define([LT_AT_CHECK_LIBTOOLIZE], -[AT_CHECK([LT_AT_LIBTOOLIZE([$1])], +[m4_if([$3], [expout], [_LIBTOOLIZE_TRANSFORM([$3])])dnl +m4_if([$4], [experr], [_LIBTOOLIZE_TRANSFORM([$4])])dnl +AT_CHECK([LT_AT_LIBTOOLIZE([$1])], [$2], [$3], [$4]) ]) @@ -161,10 +176,23 @@ m4_define([LT_ESCAPE], m4_define([LT_AT_CHECK], [echo "LT_ESCAPE([$1])"; AT_CHECK($@)]) + +# _LT_AT_TRANSLATE_TEXT_OUTPUT(FILE) +# ---------------------------------- +# Ensure correct line ending for expected output of host executables. +m4_define([_LT_AT_TRANSLATE_TEXT_OUTPUT], +[case $host_os in mingw*) + while read -r l; do printf "%s\r\n" "$l"; done < $1 > $1.t + mv -f $1.t $1 ;; +esac]) + + # LT_AT_EXEC_CHECK(EXECUTABLE, [STATUS = 0], [STDOUT], [STDERR]) # -------------------------------------------------------------- m4_define([LT_AT_EXEC_CHECK], -[AT_CHECK([$1; lt_status=$?; if test $lt_status -eq 0; then :; +[m4_if([$3], [expout], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$3])]) +m4_if([$4], [experr], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$4])]) +AT_CHECK([$1; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$1" || test -x "$1"$EXEEXT; } then (exit 77); else (exit $lt_status); fi],[$2],[$3],[$4]) @@ -175,7 +203,9 @@ m4_define([LT_AT_EXEC_CHECK], # [STATUS = 0], [STDOUT], [STDERR]) # --------------------------------------------------------- m4_define([LT_AT_NOINST_EXEC_CHECK], -[AT_CHECK([$LIBTOOL --mode=execute $2 $1; lt_status=$?; +[m4_if([$4], [expout], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$4])]) +m4_if([$5], [experr], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$5])]) +AT_CHECK([$LIBTOOL --mode=execute $2 $1; lt_status=$?; if test $lt_status -eq 0; then :; elif test "X$host" != "X$build" && \ { test -x "$1" || test -x "$1"$EXEEXT; }