diff -Nru worker-3.14.0/aclocal.m4 worker-3.15.4/aclocal.m4 --- worker-3.14.0/aclocal.m4 2017-12-08 22:28:11.000000000 +0000 +++ worker-3.15.4/aclocal.m4 2019-01-28 21:41:01.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,32 +20,63 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program 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. -# -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -67,18 +98,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -88,8 +120,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -101,10 +135,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -112,26 +147,24 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -141,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -162,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -178,16 +211,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -198,16 +255,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -218,13 +277,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -233,9 +294,9 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -247,10 +308,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,14 +327,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -325,7 +386,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -356,7 +417,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -547,7 +608,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -623,7 +684,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -632,6 +693,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -707,8 +774,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -740,6 +807,51 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -748,7 +860,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -770,7 +881,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -781,7 +892,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -791,7 +902,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -810,7 +921,7 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Copyright (C) 1998-2013 Free Software Foundation, Inc. +# Copyright (C) 1998-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -830,7 +941,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -880,7 +991,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -921,7 +1032,7 @@ # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -948,7 +1059,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -977,9 +1088,73 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1060,7 +1235,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1120,7 +1295,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1148,7 +1323,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1167,7 +1342,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru worker-3.14.0/catalogs/cesky.catalog worker-3.15.4/catalogs/cesky.catalog --- worker-3.14.0/catalogs/cesky.catalog 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/cesky.catalog 2019-01-28 21:41:04.000000000 +0000 @@ -3624,7 +3624,43 @@ 1202:Nahrt ###################### # Remove -1203: +1203:Odstranit ###################### # Invalid profile name %s -1204: +1204:Chybn jmno profilu %s +###################### +# Failed to execute the following command:\\n%s\\nThe return code was:%d\\n and the error output was:\\n +1205:Cyba pi provdn nsledujcho pkazu:\\n%s\\nChybov kd byl:%d\\n a chybov vstup byl:\\n +###################### +# The given program will be executed and the output lines will be added to a new virtual directory as files. Each output line is considered one file name. Absolute paths will be used as is, relative paths will be interpreted relatively to the current directory. +1206:Dan program bude sputn a vstupn dky budou pidny do virtulnho adrese jako soubory. Kad vstupn dek je brn jako jedno jmno souboru. Absolutn cesty budou pouity jako jsou, relativn cesty budou zobrazeny relativn k aktulnmu adresi. +###################### +# Program and arguments: +1207:Program a argumenty: +###################### +# State bar font +1208:Font stavovho dku +###################### +# Preserve base directories in virtual dirs +1209:Zachovat zkladn adrese ve virtulnch slokch +###################### +# Failed to create some of the intermediate directories of %s +1210:Chyba pi vytven nkterho z pechodnch adres %s +###################### +# Failed to prepare the intermediate directory information for %s +1211:Chyba pi pprav informac o pechodnm adresi %s +###################### +# Toggle lock state +1212:Pepnout stav uzamen +###################### +# Lock tab +1213:Zamknout tab +###################### +# Unlock tab +1214:Odemknout tab +###################### +# Move to the left +1215:Pesunout doleva +###################### +# Move to the right +1216:Pesunout doprava diff -Nru worker-3.14.0/catalogs/cesky.catalog.coms worker-3.15.4/catalogs/cesky.catalog.coms --- worker-3.14.0/catalogs/cesky.catalog.coms 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/cesky.catalog.coms 2019-01-28 21:41:04.000000000 +0000 @@ -218,3 +218,9 @@ ###################### # Tab profiles 67:Profily karet +###################### +# External virtual dir +68:Extern virtuln adres +###################### +# Open tab menu +69:Otevt tab menu diff -Nru worker-3.14.0/catalogs/cesky.catalog.coms.utf8 worker-3.15.4/catalogs/cesky.catalog.coms.utf8 --- worker-3.14.0/catalogs/cesky.catalog.coms.utf8 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/catalogs/cesky.catalog.coms.utf8 2019-01-28 21:40:22.000000000 +0000 @@ -218,3 +218,9 @@ ###################### # Tab profiles 67:Profily karet +###################### +# External virtual dir +68:Externí virtuální adresář +###################### +# Open tab menu +69:Otevřít tab menu diff -Nru worker-3.14.0/catalogs/cesky.catalog.utf8 worker-3.15.4/catalogs/cesky.catalog.utf8 --- worker-3.14.0/catalogs/cesky.catalog.utf8 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/catalogs/cesky.catalog.utf8 2019-01-28 21:40:22.000000000 +0000 @@ -3624,7 +3624,43 @@ 1202:Nahrát ###################### # Remove -1203: +1203:Odstranit ###################### # Invalid profile name %s -1204: +1204:Chybné jméno profilu %s +###################### +# Failed to execute the following command:\\n%s\\nThe return code was:%d\\n and the error output was:\\n +1205:Cyba při provádění následujícího příkazu:\\n%s\\nChybový kód byl:%d\\n a chybový výstup byl:\\n +###################### +# The given program will be executed and the output lines will be added to a new virtual directory as files. Each output line is considered one file name. Absolute paths will be used as is, relative paths will be interpreted relatively to the current directory. +1206:Daný program bude spuštěn a výstupní řádky budou přidány do virtuálního adresáře jako soubory. Každý výstupní řádek je brán jako jedno jméno souboru. Absolutní cesty budou použity jako jsou, relativní cesty budou zobrazeny relativně k aktuálnímu adresáři. +###################### +# Program and arguments: +1207:Program a argumenty: +###################### +# State bar font +1208:Font stavového řádku +###################### +# Preserve base directories in virtual dirs +1209:Zachovat základní adresáře ve virtuálních složkách +###################### +# Failed to create some of the intermediate directories of %s +1210:Chyba při vytváření některého z přechodných adresářů %s +###################### +# Failed to prepare the intermediate directory information for %s +1211:Chyba při přípravě informací o přechodném adresáři %s +###################### +# Toggle lock state +1212:Přepnout stav uzamčení +###################### +# Lock tab +1213:Zamknout tab +###################### +# Unlock tab +1214:Odemknout tab +###################### +# Move to the left +1215:Přesunout doleva +###################### +# Move to the right +1216:Přesunout doprava diff -Nru worker-3.14.0/catalogs/deutsch.catalog worker-3.15.4/catalogs/deutsch.catalog --- worker-3.14.0/catalogs/deutsch.catalog 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/catalogs/deutsch.catalog 2019-01-28 21:40:22.000000000 +0000 @@ -1,7 +1,7 @@ ######################################################## # This translation is part of Worker # -# (C) 2007-2017 Ralf Hoffmann +# (C) 2007-2018 Ralf Hoffmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -3644,3 +3644,27 @@ ###################### # State bar font 1208:Zeichensatz fr die Statusleiste +###################### +# Preserve base directories in virtual dirs +1209:Basisverzeichnisse in virtuellen Verzeichnissen beibehalten +###################### +# Failed to create some of the intermediate directories of %s +1210:Fehler beim Erzeugen von Zwischenverzeichnissen von %s +###################### +# Failed to prepare the intermediate directory information for %s +1211:Konnte keine Informationen erhalten ber Vaterverzeichnisse von %s +###################### +# Toggle lock state +1212:Tab-Sperre umkehren +###################### +# Lock tab +1213:Tab sperren +###################### +# Unlock tab +1214:Tab entsperren +###################### +# Move to the left +1215:Nach links verschieben +###################### +# Move to the right +1216:Nach rechts verschieben diff -Nru worker-3.14.0/catalogs/deutsch.catalog.coms worker-3.15.4/catalogs/deutsch.catalog.coms --- worker-3.14.0/catalogs/deutsch.catalog.coms 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/catalogs/deutsch.catalog.coms 2019-01-28 21:40:22.000000000 +0000 @@ -1,7 +1,7 @@ ######################################################## # This translation is part of Worker # -# (C) 2007-2017 Ralf Hoffmann +# (C) 2007-2018 Ralf Hoffmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -223,3 +223,6 @@ ###################### # External virtual dir 68:Externes virtuelles Verzeichnis +###################### +# Open tab menu +69:ffne Tab-Men diff -Nru worker-3.14.0/catalogs/deutsch.catalog.coms.utf8 worker-3.15.4/catalogs/deutsch.catalog.coms.utf8 --- worker-3.14.0/catalogs/deutsch.catalog.coms.utf8 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/deutsch.catalog.coms.utf8 2019-01-28 21:41:04.000000000 +0000 @@ -1,7 +1,7 @@ ######################################################## # This translation is part of Worker # -# (C) 2007-2017 Ralf Hoffmann +# (C) 2007-2018 Ralf Hoffmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -223,3 +223,6 @@ ###################### # External virtual dir 68:Externes virtuelles Verzeichnis +###################### +# Open tab menu +69:Öffne Tab-Menü diff -Nru worker-3.14.0/catalogs/deutsch.catalog.utf8 worker-3.15.4/catalogs/deutsch.catalog.utf8 --- worker-3.14.0/catalogs/deutsch.catalog.utf8 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/deutsch.catalog.utf8 2019-01-28 21:41:04.000000000 +0000 @@ -1,7 +1,7 @@ ######################################################## # This translation is part of Worker # -# (C) 2007-2017 Ralf Hoffmann +# (C) 2007-2018 Ralf Hoffmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -3644,3 +3644,27 @@ ###################### # State bar font 1208:Zeichensatz für die Statusleiste +###################### +# Preserve base directories in virtual dirs +1209:Basisverzeichnisse in virtuellen Verzeichnissen beibehalten +###################### +# Failed to create some of the intermediate directories of %s +1210:Fehler beim Erzeugen von Zwischenverzeichnissen von %s +###################### +# Failed to prepare the intermediate directory information for %s +1211:Konnte keine Informationen erhalten über Vaterverzeichnisse von %s +###################### +# Toggle lock state +1212:Tab-Sperre umkehren +###################### +# Lock tab +1213:Tab sperren +###################### +# Unlock tab +1214:Tab entsperren +###################### +# Move to the left +1215:Nach links verschieben +###################### +# Move to the right +1216:Nach rechts verschieben diff -Nru worker-3.14.0/catalogs/Makefile.in worker-3.15.4/catalogs/Makefile.in --- worker-3.14.0/catalogs/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = catalogs -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -92,6 +101,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -145,6 +155,7 @@ am__installdirs = "$(DESTDIR)$(workercatalogsdir)" DATA = $(workercatalogs_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -199,6 +210,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -383,7 +395,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu catalogs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu catalogs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -583,6 +594,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-workercatalogsDATA +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/catalogs/russian.catalog worker-3.15.4/catalogs/russian.catalog --- worker-3.14.0/catalogs/russian.catalog 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/catalogs/russian.catalog 2019-01-28 21:40:22.000000000 +0000 @@ -3555,3 +3555,114 @@ ###################### # Open a new tab in the current list view and highlight the currently viewed file 1179: +###################### +# Compare the directory in the active and inactive panel based on the criterion selected below. The equal entries will be selected in the active panel (and the unequal entries will be unselected). The inactive panel works inverse, so that all unequal entries will be selected and the equal ones will be unselected. You can also choose to show the results in virtual directories. In this case the active panel will be a virtual directory will all equal files and directories while the inactive panel will be a virtual directory with all unequal elements. +1180: , . ( ). , , - . . , , . +###################### +# How to compare files: +1181: : +###################### +# Fast comparison with file size only +1182: ( ) +###################### +# Compare size and modification time +1183: +###################### +# Slow comparison with content +1184: ( ) +###################### +# How to use result: +1185: : +###################### +# Change selection state +1186: +###################### +# Show as virtual directories +1187: +###################### +# Remaining entries to compare: +1188: : +###################### +# File compare progress: +1189: : +###################### +# Current directory: +1190: : +###################### +# %lu of %lu +1191:%lu %lu +###################### +# left hand side: +1192:: +###################### +# right hand side: +1193:: +###################### +# Error writing tab profile %s +1194: %s +###################### +# Enter a profile name to store currently opened tabs or select a existing profile to restore given set of tabs. You may also choose to remove the profile after opening it successfully. +1195: , , . . +###################### +# Save tabs currently opened as new profile: +1196: : +###################### +# Existing profiles: +1197: : +###################### +# Available profiles: +1198: : +###################### +# Profile content: +1199: : +###################### +# Open +1200: +###################### +# Open and remove +1201: +###################### +# Load +1202: +###################### +# Remove +1203: +###################### +# Invalid profile name %s +1204: %s +###################### +# Failed to execute the following command:\\n%s\\nThe return code was:%d\\n and the error output was:\\n +1205: :\\n%s\\n :%d\\n :\\n +###################### +# The given program will be executed and the output lines will be added to a new virtual directory as files. Each output line is considered one file name. Absolute paths will be used as is, relative paths will be interpreted relatively to the current directory. +1206: , . . , . +###################### +# Program and arguments: +1207: : +###################### +# State bar font +1208: - +###################### +# Preserve base directories in virtual dirs +1209: +###################### +# Failed to create some of the intermediate directories of %s +1210: %s +###################### +# Failed to prepare the intermediate directory information for %s +1211: %s +###################### +# Toggle lock state +1212: +###################### +# Lock tab +1213: +###################### +# Unlock tab +1214: +###################### +# Move to the left +1215: +###################### +# Move to the right +1216: diff -Nru worker-3.14.0/catalogs/russian.catalog.coms worker-3.15.4/catalogs/russian.catalog.coms --- worker-3.14.0/catalogs/russian.catalog.coms 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/catalogs/russian.catalog.coms 2019-01-28 21:40:22.000000000 +0000 @@ -212,3 +212,15 @@ ###################### # View newest files 65: +###################### +# Compare directories +66: +###################### +# Tab profiles +67: +###################### +# External virtual dir +68: +###################### +# Open tab menu +69: diff -Nru worker-3.14.0/catalogs/russian.catalog.coms.utf8 worker-3.15.4/catalogs/russian.catalog.coms.utf8 --- worker-3.14.0/catalogs/russian.catalog.coms.utf8 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/russian.catalog.coms.utf8 2019-01-28 21:41:04.000000000 +0000 @@ -212,3 +212,15 @@ ###################### # View newest files 65:Посмотреть новейшие файлы +###################### +# Compare directories +66:Сравнение каталогов +###################### +# Tab profiles +67:Профили вкладок +###################### +# External virtual dir +68:Внешний виртуальный каталог +###################### +# Open tab menu +69:Открыть меню вкладок diff -Nru worker-3.14.0/catalogs/russian.catalog.utf8 worker-3.15.4/catalogs/russian.catalog.utf8 --- worker-3.14.0/catalogs/russian.catalog.utf8 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/russian.catalog.utf8 2019-01-28 21:41:04.000000000 +0000 @@ -3555,3 +3555,114 @@ ###################### # Open a new tab in the current list view and highlight the currently viewed file 1179:Открыть новую вкладку в текущем списке и выделить просматриваемый файл +###################### +# Compare the directory in the active and inactive panel based on the criterion selected below. The equal entries will be selected in the active panel (and the unequal entries will be unselected). The inactive panel works inverse, so that all unequal entries will be selected and the equal ones will be unselected. You can also choose to show the results in virtual directories. In this case the active panel will be a virtual directory will all equal files and directories while the inactive panel will be a virtual directory with all unequal elements. +1180:Сравнение каталогов в активной и неактивной панелях на основе критериев, выбранных ниже. Совпадающие записи будут выделены в активной панели (не совпадающие записи не выделяются). Неактивная панель работает наоборот, все не совпадающие записи выделяются, а совпадающие - нет. Также вы можете вывести результаты сравнения в виртуальные каталоги. В этом случае активная панель будет виртуальным каталогом, в котором показаны совпадающие файлы и каталоги, при этом неактивная панель будет виртуальным каталогом со всеми не совпадающими элементами. +###################### +# How to compare files: +1181:Сравнение файлов: +###################### +# Fast comparison with file size only +1182:Быстрое сравнение (только по размеру файлов) +###################### +# Compare size and modification time +1183:Сравнивать размер и время изменения +###################### +# Slow comparison with content +1184:Медленное сравнение (по содержимому) +###################### +# How to use result: +1185:Использование результата: +###################### +# Change selection state +1186:Изменение состояния выбора +###################### +# Show as virtual directories +1187:Показать как виртуальные каталоги +###################### +# Remaining entries to compare: +1188:Оставшиеся записи для сравнения: +###################### +# File compare progress: +1189:Выполнение файлового сравнения: +###################### +# Current directory: +1190:Текущий каталог: +###################### +# %lu of %lu +1191:%lu из %lu +###################### +# left hand side: +1192:Слева: +###################### +# right hand side: +1193:Справа: +###################### +# Error writing tab profile %s +1194:Ошибка записи профиля вкладки %s +###################### +# Enter a profile name to store currently opened tabs or select a existing profile to restore given set of tabs. You may also choose to remove the profile after opening it successfully. +1195:Введите имя профиля, чтобы сохранить текущие открытые вкладки или выберите существующий профиль, чтобы восстановить данный набор вкладок. Также вы можете удалить профиль после его успешного открытия. +###################### +# Save tabs currently opened as new profile: +1196:Сохранить текущие открытые вкладки в новый профиль: +###################### +# Existing profiles: +1197:Имеющиеся профили: +###################### +# Available profiles: +1198:Доступные профили: +###################### +# Profile content: +1199:Профиль содержит: +###################### +# Open +1200:Открыть +###################### +# Open and remove +1201:Открыть и удалить +###################### +# Load +1202:Загрузить +###################### +# Remove +1203:Удалить +###################### +# Invalid profile name %s +1204:Неверное имя профиля %s +###################### +# Failed to execute the following command:\\n%s\\nThe return code was:%d\\n and the error output was:\\n +1205:Ошибка выполнения следующей команды:\\n%s\\nКод возврата был:%d\\n и вывод ошибок был:\\n +###################### +# The given program will be executed and the output lines will be added to a new virtual directory as files. Each output line is considered one file name. Absolute paths will be used as is, relative paths will be interpreted relatively to the current directory. +1206:Данная программа будет выполнена, и выходные строки будут добавлены к новому виртуальному каталогу как файлы. Каждая выходная строка считается одним именем файла. Абсолютные пути будут использованы как есть, относительные пути будут интерпретироваться относительно текущего каталога. +###################### +# Program and arguments: +1207:Программа и аргументы: +###################### +# State bar font +1208:Шрифт статус-бара +###################### +# Preserve base directories in virtual dirs +1209:Сохранять базовые каталоги в виртуальных директориях +###################### +# Failed to create some of the intermediate directories of %s +1210:Не удалось создать несколько промежуточных каталогов %s +###################### +# Failed to prepare the intermediate directory information for %s +1211:Не удалось подготовить информацию для промежуточного каталога %s +###################### +# Toggle lock state +1212:Переключить состояние закрепления +###################### +# Lock tab +1213:Закрепить вкладку +###################### +# Unlock tab +1214:Открепить вкладку +###################### +# Move to the left +1215:Переместить влево +###################### +# Move to the right +1216:Переместить вправо diff -Nru worker-3.14.0/catalogs/template.catalog worker-3.15.4/catalogs/template.catalog --- worker-3.14.0/catalogs/template.catalog 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/template.catalog 2019-01-28 21:41:04.000000000 +0000 @@ -3642,3 +3642,27 @@ ###################### # State bar font 1208: +###################### +# Preserve base directories in virtual dirs +1209: +###################### +# Failed to create some of the intermediate directories of %s +1210: +###################### +# Failed to prepare the intermediate directory information for %s +1211: +###################### +# Toggle lock state +1212: +###################### +# Lock tab +1213: +###################### +# Unlock tab +1214: +###################### +# Move to the left +1215: +###################### +# Move to the right +1216: diff -Nru worker-3.14.0/catalogs/template.catalog.coms worker-3.15.4/catalogs/template.catalog.coms --- worker-3.14.0/catalogs/template.catalog.coms 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/catalogs/template.catalog.coms 2019-01-28 21:41:04.000000000 +0000 @@ -221,3 +221,6 @@ ###################### # External virtual dir 68: +###################### +# Open tab menu +69: diff -Nru worker-3.14.0/ChangeLog worker-3.15.4/ChangeLog --- worker-3.14.0/ChangeLog 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/ChangeLog 2019-01-28 21:40:22.000000000 +0000 @@ -1,5 +1,95 @@ # -*- mode: Org;-*- +* 2019-01-28: Version 3.15.4: + +** fixes: + + - fixed compile issue on architectures with char being unsigned by + default. + +** other changes: + + - improved performance of the text viewer with word wrapping enabled + for very long lines without any space. + +* 2019-01-09: Version 3.15.3: + +** fixes: + + - fixed drag'N'drop not working with utf8 file names. + +** other changes: + + - add example script for adding all untracked files in a git + repository into a virtual directory. Also fixed example script for + modified git files to work in sub-directories. + - change image mode script for ImageMagick to convert to png on the + flight to avoid lockup when showing animated gif files. + +* 2018-08-28: Version 3.15.2: + +** fixes: + + - fixed drag'N'drop not working with some programs + +* 2018-05-16: Version 3.15.1: + +** fixes: + + - fixed use of uninitialized variable in copy with the option to + preserve the directory structure enabled. This bug could result in + inconsistent view of the virtual directory content. + - fixed compiler warning about use of C++14 feature. + +** other changes: + + - case insensitive sort of file names has been improved to create a + stable sort order and to correctly restore file selection state on + reload. + - updated Czech translation + (Thanks to Petr Korviny) + - updated Russian translation + +* 2018-01-22: Version 3.15.0: + +** new features: + + - the command menu now also list all regular commands including + interactive variants (commands which can be configured to query + parameters before actual execution). This allows to access + commands that are not assigned to any button or hotkey. + - the copy command can now optionally preserve the directory + structure when copying entries from virtual directories. For + example, if a virtual directory contains the elements a/foo and + b/bar and the target directory is /c, with this option enabled + both files will be copied to /c/a/foo and /c/b/bar respectively + instead of just /c/foo and /c/bar. The intermediate directories + "a" and "b" are created if necessary. + - tabs can now be locked so they cannot be closed. Right-clicking on + a tab opens a menu allowing to toggle the lock state and the + "modify tabs" command can also be used to toggle the state. + - tabs can be reordered by selecting the move option in the menu or + the "modify tabs" command. + - there is a new command "open tab menu" which opens the tab menu + for the current tab. + +** other changes: + + - files added to a virtual directory by the "external virtual dir" + command are now normalized so that "." and ".." are no longer + within the paths. + - added another example script for the "external virtual dir" + command to list all files matching a given checksum in a virtual + directory. The corresponding button is available as a config + update. + - mouse selection in text view now works better when mouse is moved + to the beginning or end of the visible text. + - in text view window Ctrl-a will select all text. + - double-clicking in the text view will select the word under the + mouse pointer. + - updated Czech translation + (Thanks to Petr Korviny) + * 2017-12-08: Version 3.14.0: ** new features: diff -Nru worker-3.14.0/compile worker-3.15.4/compile --- worker-3.14.0/compile 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/compile 2019-01-28 21:41:03.000000000 +0000 @@ -0,0 +1,348 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2016-01-11.22; # UTC + +# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program 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, or (at your option) +# any later version. +# +# This program 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 this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff -Nru worker-3.14.0/config.guess worker-3.15.4/config.guess --- worker-3.14.0/config.guess 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/config.guess 2019-01-28 21:41:03.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2017-05-27' # 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 @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -178,19 +178,29 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-${VENDOR}-unknown + ;; + *) machine=${UNAME_MACHINE_ARCH}-${VENDOR}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -207,6 +217,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -217,13 +234,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -233,6 +250,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-${VENDOR}-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE} exit ;; @@ -245,6 +266,9 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -261,42 +285,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -369,16 +393,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -403,7 +427,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -589,8 +613,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -627,13 +652,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -672,11 +697,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -689,12 +714,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -799,14 +824,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -822,10 +847,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -836,7 +862,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -888,7 +914,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -911,7 +937,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -942,6 +968,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; @@ -954,6 +983,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; @@ -979,10 +1011,13 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) + mips64el:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; - or32:Linux:*:*) + openrisc*:Linux:*:*) + echo or1k-${VENDOR}-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1011,6 +1046,9 @@ ppcle:Linux:*:*) echo powerpcle-${VENDOR}-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1030,7 +1068,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} @@ -1109,7 +1147,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1258,6 +1296,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1270,22 +1311,39 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1294,15 +1352,18 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1316,7 +1377,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1358,7 +1419,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1369,171 +1430,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-${VENDOR}-esx exit ;; -esac - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd + amd64:Isilon\ OneFS:*:*) + echo x86_64-${VENDOR}-onefs exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi +esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff -Nru worker-3.14.0/config.sub worker-3.15.4/config.sub --- worker-3.14.0/config.sub 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/config.sub 2019-01-28 21:41:03.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2017-04-02' # 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 @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,8 +116,8 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -255,16 +254,18 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,14 +298,15 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -310,6 +314,8 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -324,7 +330,10 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -369,18 +378,20 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +411,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,16 +426,19 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -430,6 +446,8 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -506,6 +524,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -626,6 +647,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -767,6 +796,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -794,7 +826,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,6 +854,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -830,7 +866,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -914,6 +950,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -998,7 +1037,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1008,7 +1047,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1039,12 +1078,18 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) + s390) basic_machine=s390-ibm ;; - s390x | s390x-*) + s390-*) + basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + s390x) basic_machine=s390x-ibm ;; + s390x-*) + basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sa29200) basic_machine=a29k-amd os=-udi @@ -1209,6 +1254,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1354,27 +1402,28 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1506,6 +1555,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1546,6 +1597,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1589,9 +1643,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; @@ -1601,6 +1652,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff -Nru worker-3.14.0/config-updates/Makefile.am worker-3.15.4/config-updates/Makefile.am --- worker-3.14.0/config-updates/Makefile.am 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/config-updates/Makefile.am 2019-01-28 21:40:22.000000000 +0000 @@ -23,6 +23,10 @@ update-3.13.0.conf \ update-3.13.0-utf8.conf \ update-3.14.0.conf \ - update-3.14.0-utf8.conf + update-3.14.0-utf8.conf \ + update-3.15.0.conf \ + update-3.15.0-utf8.conf \ + update-3.15.3.conf \ + update-3.15.3-utf8.conf EXTRA_DIST = ${configupdates_DATA} diff -Nru worker-3.14.0/config-updates/Makefile.in worker-3.15.4/config-updates/Makefile.in --- worker-3.14.0/config-updates/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/config-updates/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = config-updates -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -92,6 +101,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -145,6 +155,7 @@ am__installdirs = "$(DESTDIR)$(configupdatesdir)" DATA = $(configupdates_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -199,6 +210,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -319,7 +331,11 @@ update-3.13.0.conf \ update-3.13.0-utf8.conf \ update-3.14.0.conf \ - update-3.14.0-utf8.conf + update-3.14.0-utf8.conf \ + update-3.15.0.conf \ + update-3.15.0-utf8.conf \ + update-3.15.3.conf \ + update-3.15.3-utf8.conf EXTRA_DIST = ${configupdates_DATA} all: all-am @@ -337,7 +353,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config-updates/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu config-updates/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -537,6 +552,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-configupdatesDATA +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/config-updates/update-3.15.0.conf worker-3.15.4/config-updates/update-3.15.0.conf --- worker-3.14.0/config-updates/update-3.15.0.conf 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/config-updates/update-3.15.0.conf 2019-01-28 21:40:22.000000000 +0000 @@ -0,0 +1,15 @@ +workerconfig 3.15.0; +buttons { + button { + position = 0; + title = "find files by chksum"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/find_file_by_chksum.py -s {Rs{Checksum value to compare with:}{}} -l {Rs{File size limit (0 means no limit):}{0}} ."; + } + } + } +} diff -Nru worker-3.14.0/config-updates/update-3.15.0-utf8.conf worker-3.15.4/config-updates/update-3.15.0-utf8.conf --- worker-3.14.0/config-updates/update-3.15.0-utf8.conf 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/config-updates/update-3.15.0-utf8.conf 2019-01-28 21:41:06.000000000 +0000 @@ -0,0 +1,15 @@ +workerconfig 3.15.0; +buttons { + button { + position = 0; + title = "find files by chksum"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/find_file_by_chksum.py -s {Rs{Checksum value to compare with:}{}} -l {Rs{File size limit (0 means no limit):}{0}} ."; + } + } + } +} diff -Nru worker-3.14.0/config-updates/update-3.15.3.conf worker-3.15.4/config-updates/update-3.15.3.conf --- worker-3.14.0/config-updates/update-3.15.3.conf 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/config-updates/update-3.15.3.conf 2019-01-28 21:40:22.000000000 +0000 @@ -0,0 +1,15 @@ +workerconfig 3.15.3; +buttons { + button { + position = 0; + title = "git untracked as vdir"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/git_untracked_files.sh"; + } + } + } +} diff -Nru worker-3.14.0/config-updates/update-3.15.3-utf8.conf worker-3.15.4/config-updates/update-3.15.3-utf8.conf --- worker-3.14.0/config-updates/update-3.15.3-utf8.conf 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/config-updates/update-3.15.3-utf8.conf 2019-01-28 21:41:06.000000000 +0000 @@ -0,0 +1,15 @@ +workerconfig 3.15.3; +buttons { + button { + position = 0; + title = "git untracked as vdir"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/git_untracked_files.sh"; + } + } + } +} diff -Nru worker-3.14.0/configure worker-3.15.4/configure --- worker-3.14.0/configure 2017-12-08 22:28:12.000000000 +0000 +++ worker-3.15.4/configure 2019-01-28 21:41:02.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for worker 3.14.0. +# Generated by GNU Autoconf 2.69 for worker 3.15.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='worker' PACKAGE_TARNAME='worker' -PACKAGE_VERSION='3.14.0' -PACKAGE_STRING='worker 3.14.0' +PACKAGE_VERSION='3.15.4' +PACKAGE_STRING='worker 3.15.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -663,6 +663,7 @@ PKG_CONFIG CXXCPP CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -796,6 +797,7 @@ enable_static with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -827,6 +829,7 @@ CCC YACC YFLAGS +LT_SYS_LIBRARY_PATH CPP CXXCPP PKG_CONFIG @@ -1383,7 +1386,7 @@ # 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 worker 3.14.0 to adapt to many kinds of systems. +\`configure' configures worker 3.15.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1460,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of worker 3.14.0:";; + short | recursive ) echo "Configuration of worker 3.15.4:";; esac cat <<\_ACEOF @@ -1491,9 +1494,12 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-x use the X Window System --with-avfs use avfs (default is YES) --with-avfs-path=PATH PATH to avfsconfig (default: autoconfig) @@ -1517,6 +1523,8 @@ YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility @@ -1607,7 +1615,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -worker configure 3.14.0 +worker configure 3.15.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2527,7 +2535,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by worker $as_me 3.14.0, which was +It was created by worker $as_me 3.15.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2880,7 +2888,7 @@ ac_config_headers="$ac_config_headers src/aguix/aguixconfig.h" -am__api_version='1.13' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -3101,7 +3109,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3395,7 +3403,7 @@ # Define the identity of the package. PACKAGE='worker' - VERSION='3.14.0' + VERSION='3.15.4' cat >>confdefs.h <<_ACEOF @@ -3429,8 +3437,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3446,6 +3454,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + ac_ext=c @@ -4236,6 +4286,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -5385,8 +5494,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -5400,7 +5509,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -5520,7 +5629,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -5843,19 +5952,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -5869,7 +5978,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -5880,7 +5989,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -5891,32 +6000,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -5959,33 +6068,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -5996,15 +6110,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -6110,9 +6224,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -6120,8 +6234,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -6172,7 +6286,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -6212,7 +6326,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -6262,22 +6376,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -6295,7 +6410,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -6313,30 +6428,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -6459,13 +6550,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -6593,13 +6684,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -6626,8 +6717,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -6663,10 +6753,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -6705,7 +6791,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -6727,8 +6813,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -6781,6 +6867,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -6938,8 +7027,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -6951,7 +7040,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -7105,7 +7194,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -7113,7 +7202,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -7126,7 +7215,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -7343,7 +7432,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -7433,7 +7522,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -7466,14 +7555,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -7491,21 +7610,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -7553,11 +7675,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -7583,7 +7705,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -7603,13 +7725,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -7630,7 +7752,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -7683,6 +7805,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -7695,9 +7827,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -7707,8 +7839,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -7720,18 +7852,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7740,24 +7953,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -7786,9 +8000,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7802,7 +8057,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -7847,7 +8109,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -7887,13 +8149,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7905,7 +8168,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -7914,7 +8177,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -7930,7 +8193,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -8041,7 +8304,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -8544,7 +8807,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -8562,7 +8825,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8601,7 +8864,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -8630,7 +8893,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8643,32 +8906,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -8676,6 +8939,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8960,9 +9258,9 @@ func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;; esac } # func_stripname_cnf @@ -8989,14 +9287,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9020,14 +9318,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9051,14 +9349,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9066,8 +9364,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -9083,14 +9379,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9104,11 +9400,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -9157,7 +9505,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -9196,7 +9544,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -9207,14 +9555,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -9223,15 +9571,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -9246,22 +9587,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -9284,13 +9625,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -9312,22 +9653,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -9350,13 +9691,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -9377,7 +9718,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9439,7 +9780,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -9455,7 +9796,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9485,7 +9826,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -9503,17 +9844,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -9524,8 +9866,8 @@ ;; 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'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -9541,6 +9883,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -9611,7 +9958,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -9619,10 +9966,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -9638,7 +10004,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -9647,9 +10013,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -9674,6 +10040,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -9771,7 +10143,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -9800,7 +10172,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -9832,7 +10204,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9862,7 +10234,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -9894,7 +10266,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9913,13 +10285,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -10039,8 +10411,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -10052,9 +10424,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -10097,9 +10469,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -10114,7 +10486,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -10122,7 +10494,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -10132,7 +10504,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -10154,24 +10526,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -10184,7 +10556,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -10203,7 +10575,7 @@ 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_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10219,7 +10591,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -10229,7 +10601,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -10237,61 +10609,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -10302,42 +10702,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -10351,8 +10756,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -10370,8 +10775,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10383,7 +10788,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -10398,9 +10803,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10417,15 +10822,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -10441,7 +10846,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -10449,34 +10854,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -10495,13 +10923,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -10520,35 +10956,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10583,7 +11026,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -10591,17 +11034,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10636,7 +11079,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -10644,21 +11087,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -10667,7 +11122,7 @@ 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_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10697,16 +11152,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -10715,18 +11171,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -10735,7 +11191,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -10754,24 +11210,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -10813,33 +11269,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -10847,25 +11303,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -10877,7 +11333,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -10896,14 +11352,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -10911,8 +11367,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -10923,7 +11379,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -10934,8 +11390,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -10945,8 +11401,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -10958,24 +11414,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -10990,7 +11456,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -10998,27 +11464,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -11029,33 +11487,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -11066,24 +11544,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -11093,11 +11571,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -11107,10 +11585,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -11159,43 +11637,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -11210,10 +11688,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -11221,7 +11699,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -11247,7 +11725,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -11462,14 +11940,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -11485,28 +11963,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -11520,7 +12005,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -11529,7 +12014,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11546,14 +12031,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -11561,41 +12048,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -11605,18 +12142,18 @@ 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}' + 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=`func_echo_all "$lib" | $SED '\''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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -11624,8 +12161,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -11637,7 +12174,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -11646,8 +12183,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -11663,17 +12200,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -11682,8 +12219,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -11710,7 +12247,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -11723,8 +12260,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -11737,7 +12274,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -11750,8 +12287,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -11764,8 +12301,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -11783,12 +12320,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -11813,26 +12351,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11850,14 +12377,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -11865,8 +12393,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -11875,8 +12403,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -11889,8 +12417,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -11901,7 +12429,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -11909,8 +12437,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -11929,8 +12457,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -11939,13 +12467,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -11989,7 +12537,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -12009,12 +12562,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -12024,7 +12577,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -12033,58 +12586,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -12095,8 +12658,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -12106,11 +12669,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -12118,8 +12681,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -12140,24 +12703,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -12175,7 +12738,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -12183,8 +12746,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -12194,20 +12757,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -12304,15 +12882,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -12327,12 +12905,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -12342,7 +12920,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -12352,23 +12930,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -12406,10 +12984,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -12417,10 +12995,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -12459,11 +13045,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -12502,7 +13088,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -12541,7 +13127,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -12580,7 +13166,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -12601,21 +13187,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -12623,7 +13209,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12670,9 +13256,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12702,7 +13288,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12722,14 +13308,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12776,9 +13362,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12808,7 +13394,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12829,9 +13415,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -12875,7 +13461,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -12903,7 +13489,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -12911,13 +13497,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -12925,8 +13511,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -12936,7 +13526,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12950,11 +13540,11 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -13133,7 +13723,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -13194,46 +13784,39 @@ CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + func_cc_basename $compiler +cc_basename=$func_cc_basename_result if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' else lt_prog_compiler_no_builtin_flag_CXX= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -13247,7 +13830,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -13258,7 +13841,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -13269,32 +13852,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -13330,22 +13913,22 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec_CXX= fi @@ -13382,18 +13965,30 @@ ld_shlibs_CXX=no ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -13403,6 +13998,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -13421,13 +14023,21 @@ hardcode_direct_absolute_CXX=yes hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' + file_list_spec_CXX='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct_CXX=no + hardcode_direct_absolute_CXX=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -13445,36 +14055,44 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec_CXX='${wl}-bexpall' + export_dynamic_flag_spec_CXX='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' + # The "-G" linker flag allows undefined symbols. + no_undefined_flag_CXX='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -13509,7 +14127,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -13517,18 +14135,18 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -13563,7 +14181,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -13571,22 +14189,34 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag_CXX=' $wl-bernotok' + allow_undefined_flag_CXX=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec_CXX='$convenience' fi archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -13596,7 +14226,7 @@ allow_undefined_flag_CXX=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs_CXX=no fi @@ -13624,57 +14254,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' enable_shared_with_static_runtimes_CXX=yes # Don't use ranlib old_postinstall_cmds_CXX='chmod 644 $oldlib' postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + export_dynamic_flag_spec_CXX='$wl--export-all-symbols' allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi @@ -13688,27 +14319,27 @@ hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec_CXX='' fi link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + allow_undefined_flag_CXX=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + if test yes != "$lt_cv_apple_cc_single_mod"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -13717,6 +14348,34 @@ ;; + os2*) + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_minus_L_CXX=yes + allow_undefined_flag_CXX=unsupported + shrext_cmds=.dll + archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes_CXX=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -13751,18 +14410,15 @@ ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes ;; hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, # but as the default @@ -13774,7 +14430,7 @@ ld_shlibs_CXX=no ;; aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -13783,11 +14439,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13797,15 +14453,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: case $host_cpu in hppa*64*|ia64*) ;; *) - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' ;; esac fi @@ -13831,13 +14487,13 @@ aCC*) case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -13848,20 +14504,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -13876,22 +14532,22 @@ interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13900,22 +14556,22 @@ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -13923,8 +14579,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -13933,10 +14589,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -13950,59 +14606,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -14016,18 +14672,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -14035,10 +14691,10 @@ *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on @@ -14096,22 +14752,17 @@ ld_shlibs_CXX=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no hardcode_direct_absolute_CXX=yes archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='$wl-E' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -14127,9 +14778,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' hardcode_libdir_separator_CXX=: # Archives containing C++ object files must be created using @@ -14147,17 +14798,17 @@ cxx*) case $host in osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; esac @@ -14172,21 +14823,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: # Commands to make compiler produce verbose output that lists @@ -14232,9 +14883,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no @@ -14242,7 +14893,7 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; @@ -14259,30 +14910,30 @@ ;; gcx*) # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + no_undefined_flag_CXX=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -14290,11 +14941,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -14303,52 +14954,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' + no_undefined_flag_CXX='$wl-z,text' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' + no_undefined_flag_CXX='$wl-z,text' + allow_undefined_flag_CXX='$wl-z,nodefs' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R,$libdir' hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' + export_dynamic_flag_spec_CXX='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" + '"$old_archive_cmds_CXX" reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" + '"$reload_cmds_CXX" ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -14380,10 +15031,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no + test no = "$ld_shlibs_CXX" && can_build_shared=no - GCC_CXX="$GXX" - LD_CXX="$LD" + GCC_CXX=$GXX + LD_CXX=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -14427,13 +15078,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -14449,16 +15100,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" + compiler_lib_search_path_CXX=$prev$p else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -14466,9 +15117,9 @@ esac else if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" + postdeps_CXX=$prev$p else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" + postdeps_CXX="${postdeps_CXX} $prev$p" fi fi prev= @@ -14483,15 +15134,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" + predep_objects_CXX=$p else predep_objects_CXX="$predep_objects_CXX $p" fi else if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" + postdep_objects_CXX=$p else postdep_objects_CXX="$postdep_objects_CXX $p" fi @@ -14521,51 +15172,6 @@ postdep_objects_CXX= postdeps_CXX= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac @@ -14574,7 +15180,7 @@ esac compiler_lib_search_dirs_CXX= if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi @@ -14613,17 +15219,18 @@ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' fi + lt_prog_compiler_pic_CXX='-fPIC' ;; amigaos*) @@ -14634,8 +15241,8 @@ ;; 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'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -14650,6 +15257,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static_CXX='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -14699,7 +15311,7 @@ case $host_os in aix[4-9]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' else @@ -14739,14 +15351,14 @@ case $cc_basename in CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then lt_prog_compiler_pic_CXX='+Z' fi ;; aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -14775,7 +15387,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14783,7 +15395,7 @@ lt_prog_compiler_pic_CXX='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' @@ -14928,7 +15540,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= ;; @@ -14960,7 +15572,7 @@ lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -14990,7 +15602,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -15016,7 +15628,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -15035,13 +15647,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : else lt_prog_compiler_static_CXX= @@ -15155,8 +15767,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -15168,9 +15780,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -15187,17 +15799,21 @@ case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" + export_symbols_cmds_CXX=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -15217,7 +15833,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no +test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -15234,7 +15850,7 @@ # Assume -lc should be added archive_cmds_need_lc_CXX=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds_CXX in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -15362,7 +15978,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -15379,14 +15995,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -15394,41 +16012,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -15438,18 +16106,18 @@ 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}' + 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=`func_echo_all "$lib" | $SED '\''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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -15457,8 +16125,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -15470,7 +16138,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -15479,8 +16147,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -15496,16 +16164,16 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -15514,8 +16182,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -15542,7 +16210,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -15555,8 +16223,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -15569,7 +16237,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -15582,8 +16250,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -15595,8 +16263,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -15614,12 +16282,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -15644,26 +16313,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -15681,14 +16339,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -15696,8 +16355,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -15706,8 +16365,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -15720,8 +16379,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -15732,7 +16391,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -15740,8 +16399,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -15760,8 +16419,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -15770,13 +16429,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -15820,7 +16499,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -15840,12 +16524,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -15855,7 +16539,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -15864,58 +16548,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -15926,8 +16620,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -15937,11 +16631,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -15949,8 +16643,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -15971,24 +16665,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -16006,7 +16700,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -16014,8 +16708,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -16025,20 +16719,32 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + @@ -16081,15 +16787,15 @@ hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then + test yes = "$hardcode_automatic_CXX"; then # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && + if test no != "$hardcode_direct_CXX" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" && + test no != "$hardcode_minus_L_CXX"; then # Linking always hardcodes the temporary library directory. hardcode_action_CXX=relink else @@ -16104,12 +16810,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then +if test relink = "$hardcode_action_CXX" || + test yes = "$inherit_rpath_CXX"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -16132,7 +16838,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -16170,7 +16876,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -16210,7 +16916,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -16260,22 +16966,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -16293,7 +17000,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -16447,8 +17154,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 -$as_echo_n "checking for CHECK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for check >= 0.9.4" >&5 +$as_echo_n "checking for check >= 0.9.4... " >&6; } if test -n "$CHECK_CFLAGS"; then pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" @@ -16488,7 +17195,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -16506,7 +17213,7 @@ usetests=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } usetests=no else @@ -20250,8 +20957,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFT" >&5 -$as_echo_n "checking for XFT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xft" >&5 +$as_echo_n "checking for xft... " >&6; } if test -n "$XFT_CFLAGS"; then pkg_cv_XFT_CFLAGS="$XFT_CFLAGS" @@ -20291,7 +20998,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -20318,7 +21025,7 @@ and XFT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -20378,8 +21085,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua" >&5 +$as_echo_n "checking for lua... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" @@ -20419,7 +21126,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -20446,7 +21153,7 @@ and LUA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -20480,8 +21187,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua5.2" >&5 +$as_echo_n "checking for lua5.2... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" @@ -20521,7 +21228,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -20548,7 +21255,7 @@ and LUA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -20584,8 +21291,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua5.1" >&5 +$as_echo_n "checking for lua5.1... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" @@ -20625,7 +21332,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -20652,7 +21359,7 @@ and LUA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -20687,8 +21394,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua-5.1" >&5 +$as_echo_n "checking for lua-5.1... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" @@ -20728,7 +21435,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -20755,7 +21462,7 @@ and LUA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -20790,8 +21497,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua-5.2" >&5 +$as_echo_n "checking for lua-5.2... " >&6; } if test -n "$LUA_CFLAGS"; then pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" @@ -20831,7 +21538,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -20858,7 +21565,7 @@ and LUA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -21199,8 +21906,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB" >&5 -$as_echo_n "checking for DBUS_GLIB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1" >&5 +$as_echo_n "checking for dbus-glib-1... " >&6; } if test -n "$DBUS_GLIB_CFLAGS"; then pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS" @@ -21240,7 +21947,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -21267,7 +21974,7 @@ and DBUS_GLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -21307,8 +22014,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL_STORAGE" >&5 -$as_echo_n "checking for HAL_STORAGE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hal-storage" >&5 +$as_echo_n "checking for hal-storage... " >&6; } if test -n "$HAL_STORAGE_CFLAGS"; then pkg_cv_HAL_STORAGE_CFLAGS="$HAL_STORAGE_CFLAGS" @@ -21348,7 +22055,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -21375,7 +22082,7 @@ and HAL_STORAGE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -22252,7 +22959,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by worker $as_me 3.14.0, which was +This file was extended by worker $as_me 3.15.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22318,7 +23025,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -worker config.status 3.14.0 +worker config.status 3.15.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -22453,6 +23160,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -22502,10 +23210,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -22570,7 +23281,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -22675,9 +23387,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -22743,7 +23458,7 @@ compiler_lib_search_path_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -22770,7 +23485,8 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path \ reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ @@ -22784,7 +23500,7 @@ postlink_cmds_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -22793,19 +23509,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -23529,55 +24242,52 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# 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. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags='CXX ' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -23597,6 +24307,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -23714,18 +24427,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -23816,8 +24538,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -23910,13 +24635,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -23982,13 +24707,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -23997,7 +24781,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -24007,165 +24791,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -24252,13 +24877,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute_CXX diff -Nru worker-3.14.0/configure.ac worker-3.15.4/configure.ac --- worker-3.14.0/configure.ac 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/configure.ac 2019-01-28 21:40:22.000000000 +0000 @@ -14,7 +14,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -AC_INIT([worker], [3.14.0]) +AC_INIT([worker], [3.15.4]) AC_CONFIG_SRCDIR([src/worker.cc]) AM_CONFIG_HEADER(src/aguix/aguixconfig.h) AM_INIT_AUTOMAKE diff -Nru worker-3.14.0/contrib/Makefile.in worker-3.15.4/contrib/Makefile.in --- worker-3.14.0/contrib/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/contrib/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = contrib -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_appdata_DATA) $(dist_applications_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -93,6 +101,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_appdata_DATA) \ + $(dist_applications_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -147,6 +157,7 @@ "$(DESTDIR)$(applicationsdir)" DATA = $(dist_appdata_DATA) $(dist_applications_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -201,6 +212,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -317,7 +329,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu contrib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -541,6 +552,8 @@ ps ps-am tags-am uninstall uninstall-am \ uninstall-dist_appdataDATA uninstall-dist_applicationsDATA +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/debian/changelog worker-3.15.4/debian/changelog --- worker-3.14.0/debian/changelog 2018-01-22 16:28:57.000000000 +0000 +++ worker-3.15.4/debian/changelog 2019-02-06 15:15:51.000000000 +0000 @@ -1,3 +1,15 @@ +worker (3.15.4-1) unstable; urgency=medium + + * New upstream version 3.15.4 + - Add Suggest for Python3, as the package now ships a Python script + - New patch to use Python 3 + * Update d/copyright + * Switch to version 4 for d/watch + * Update to Standards-Version 4.3.0, no changes needed + * Use debhelper-compat (= 12) + + -- Dr. Tobias Quathamer Wed, 06 Feb 2019 16:15:51 +0100 + worker (3.14.0-2) unstable; urgency=medium * Use debhelper v11 diff -Nru worker-3.14.0/debian/compat worker-3.15.4/debian/compat --- worker-3.14.0/debian/compat 2018-01-22 16:23:33.000000000 +0000 +++ worker-3.15.4/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru worker-3.14.0/debian/control worker-3.15.4/debian/control --- worker-3.14.0/debian/control 2018-01-22 16:27:27.000000000 +0000 +++ worker-3.15.4/debian/control 2019-02-06 15:15:42.000000000 +0000 @@ -2,11 +2,11 @@ Section: x11 Priority: optional Maintainer: Dr. Tobias Quathamer -Build-Depends: debhelper (>= 11), avfs, libmagic-dev, libx11-dev, +Build-Depends: debhelper-compat (= 12), avfs, libmagic-dev, libx11-dev, libxft-dev, liblzma-dev [ppc64el], libdbus-glib-1-dev, liblua5.2-dev, # Needed to enable unit testing check -Standards-Version: 4.1.3 +Standards-Version: 4.3.0 Homepage: http://www.boomerangsworld.de/worker Vcs-Browser: https://salsa.debian.org/debian/worker Vcs-Git: https://salsa.debian.org/debian/worker.git @@ -31,6 +31,7 @@ Multi-Arch: foreign Depends: ${misc:Depends} Recommends: worker +Suggests: python3 Description: data files for worker This package contains architecture independent data files for the worker file manager. diff -Nru worker-3.14.0/debian/copyright worker-3.15.4/debian/copyright --- worker-3.14.0/debian/copyright 2018-01-22 16:23:54.000000000 +0000 +++ worker-3.15.4/debian/copyright 2019-02-06 14:43:10.000000000 +0000 @@ -9,7 +9,7 @@ Files: debian/* Copyright: © 2001-2002 Rick Younie - © 2003-2018 Dr. Tobias Quathamer + © 2003-2019 Dr. Tobias Quathamer License: GPL-2+ License: GPL-2+ diff -Nru worker-3.14.0/debian/patches/0002-Use-python3.patch worker-3.15.4/debian/patches/0002-Use-python3.patch --- worker-3.14.0/debian/patches/0002-Use-python3.patch 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/debian/patches/0002-Use-python3.patch 2019-02-06 14:42:09.000000000 +0000 @@ -0,0 +1,18 @@ +From: "Dr. Tobias Quathamer" +Date: Wed, 24 Jan 2018 14:32:02 +0100 +Subject: Use python3 + +--- + scripts/find_file_by_chksum.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/find_file_by_chksum.py b/scripts/find_file_by_chksum.py +index 71b7607..86d3f05 100755 +--- a/scripts/find_file_by_chksum.py ++++ b/scripts/find_file_by_chksum.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/python3 + # + # This script outputs all files matching a given checksum + diff -Nru worker-3.14.0/debian/patches/series worker-3.15.4/debian/patches/series --- worker-3.14.0/debian/patches/series 2017-12-14 15:05:24.000000000 +0000 +++ worker-3.15.4/debian/patches/series 2019-02-06 14:42:09.000000000 +0000 @@ -1 +1,2 @@ 0001-Use-png-icon.patch +0002-Use-python3.patch diff -Nru worker-3.14.0/debian/watch worker-3.15.4/debian/watch --- worker-3.14.0/debian/watch 2017-09-17 15:04:02.000000000 +0000 +++ worker-3.15.4/debian/watch 2019-02-06 14:43:57.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 +version=4 opts=uversionmangle=s/(\d)(rc\d*)$/$1~$2/,pgpsigurlmangle=s/$/.asc/ \ http://www.boomerangsworld.de/cms/worker/downloads/worker-(\d.*)\.tar\.(?:bz2|xz) diff -Nru worker-3.14.0/depcomp worker-3.15.4/depcomp --- worker-3.14.0/depcomp 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/depcomp 2019-01-28 21:41:03.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru worker-3.14.0/examples/config-deutsch worker-3.15.4/examples/config-deutsch --- worker-3.14.0/examples/config-deutsch 2017-12-08 22:28:15.000000000 +0000 +++ worker-3.15.4/examples/config-deutsch 2019-01-28 21:41:05.000000000 +0000 @@ -1,4 +1,4 @@ -workerconfig 3.14.0; +workerconfig 3.15.3; global { lang = "deutsch"; rows = 4; @@ -3072,6 +3072,30 @@ } } } + button { + position = 179; + title = "git-unbekannt als VDir"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/git_untracked_files.sh"; + } + } + } + button { + position = 180; + title = "Finde Datei anhand der Prfsumme"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/find_file_by_chksum.py -s {Rs{Zu vergleichende Prfsumme:}{}} -l {Rs{Dateigrengrenze (0 bedeutet keine Beschrnkung):}{0}} ."; + } + } + } button { position = 182; title = "git clone"; diff -Nru worker-3.14.0/examples/config-deutsch.utf8 worker-3.15.4/examples/config-deutsch.utf8 --- worker-3.14.0/examples/config-deutsch.utf8 2017-12-08 22:28:17.000000000 +0000 +++ worker-3.15.4/examples/config-deutsch.utf8 2019-01-28 21:41:06.000000000 +0000 @@ -1,4 +1,4 @@ -workerconfig 3.14.0; +workerconfig 3.15.3; global { lang = "deutsch"; rows = 4; @@ -3072,6 +3072,30 @@ } } } + button { + position = 179; + title = "git-unbekannt als VDir"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/git_untracked_files.sh"; + } + } + } + button { + position = 180; + title = "Finde Datei anhand der Prüfsumme"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/find_file_by_chksum.py -s {Rs{Zu vergleichende Prüfsumme:}{}} -l {Rs{Dateigrößengrenze (0 bedeutet keine Beschränkung):}{0}} ."; + } + } + } button { position = 182; title = "git clone"; diff -Nru worker-3.14.0/examples/config-english worker-3.15.4/examples/config-english --- worker-3.14.0/examples/config-english 2017-12-08 22:28:14.000000000 +0000 +++ worker-3.15.4/examples/config-english 2019-01-28 21:41:04.000000000 +0000 @@ -1,4 +1,4 @@ -workerconfig 3.14.0; +workerconfig 3.15.3; global { lang = "builtin"; rows = 4; @@ -3072,6 +3072,30 @@ } } } + button { + position = 179; + title = "git untracked as vdir"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/git_untracked_files.sh"; + } + } + } + button { + position = 180; + title = "Find files by chksum"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/find_file_by_chksum.py -s {Rs{Checksum value to compare with:}{}} -l {Rs{File size limit (0 means no limit):}{0}} ."; + } + } + } button { position = 182; title = "git clone"; diff -Nru worker-3.14.0/examples/config-slovensky worker-3.15.4/examples/config-slovensky --- worker-3.14.0/examples/config-slovensky 2017-12-08 22:28:16.000000000 +0000 +++ worker-3.15.4/examples/config-slovensky 2019-01-28 21:41:06.000000000 +0000 @@ -1,4 +1,4 @@ -workerconfig 3.14.0; +workerconfig 3.15.3; global { lang = "slovensky"; rows = 4; @@ -3072,6 +3072,30 @@ } } } + button { + position = 179; + title = "git untracked as vdir"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/git_untracked_files.sh"; + } + } + } + button { + position = 180; + title = "Find files by chksum"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/find_file_by_chksum.py -s {Rs{Checksum value to compare with:}{}} -l {Rs{File size limit (0 means no limit):}{0}} ."; + } + } + } button { position = 182; title = "git clone"; diff -Nru worker-3.14.0/examples/config-slovensky.utf8 worker-3.15.4/examples/config-slovensky.utf8 --- worker-3.14.0/examples/config-slovensky.utf8 2017-12-08 22:28:17.000000000 +0000 +++ worker-3.15.4/examples/config-slovensky.utf8 2019-01-28 21:41:06.000000000 +0000 @@ -1,4 +1,4 @@ -workerconfig 3.14.0; +workerconfig 3.15.3; global { lang = "slovensky"; rows = 4; @@ -3072,6 +3072,30 @@ } } } + button { + position = 179; + title = "git untracked as vdir"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/git_untracked_files.sh"; + } + } + } + button { + position = 180; + title = "Find files by chksum"; + color = 1,0; + shortkeys { + } + commands { + ExternalVDirOp { + commandstring = "{scripts}/find_file_by_chksum.py -s {Rs{Checksum value to compare with:}{}} -l {Rs{File size limit (0 means no limit):}{0}} ."; + } + } + } button { position = 182; title = "git clone"; diff -Nru worker-3.14.0/examples/Makefile.in worker-3.15.4/examples/Makefile.in --- worker-3.14.0/examples/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/examples/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = examples -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -92,6 +101,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -145,6 +155,7 @@ am__installdirs = "$(DESTDIR)$(workerdefaultconfigdir)" DATA = $(workerdefaultconfig_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -199,6 +210,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -319,7 +331,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu examples/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -519,6 +530,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-local uninstall-workerdefaultconfigDATA +.PRECIOUS: Makefile + uninstall-local: sh $(srcdir)/uninstall_script diff -Nru worker-3.14.0/hints/hints-english worker-3.15.4/hints/hints-english --- worker-3.14.0/hints/hints-english 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/hints/hints-english 2019-01-28 21:40:22.000000000 +0000 @@ -73,3 +73,8 @@ Hint: Add entries from the other panel into the current virtual dir by calling the command "vdir_add_selected_from_other_side". Hint: Enter filter expressions like (name=*.o&size>10k) with {SearchEntryOp}.|Hint: Enter filter expression like (name=*.o&size>10k) with the {SearchEntryOp-descr} command. Hint: See the command assigned to button by holding Control while clicking on it. +Hint: You can show files modified during the last day by filtering for (tm<1d). +Hint: Get a list of recently used files by pressing {ViewNewestFilesOp-keyall}.|Get a list of recently used files by using the {ViewNewestFilesOp-descr} command. +Hint: Change file filters directly by using the context menu. +Hint: Use the {DirCompareOp-descr} command to compare directories based on file size or content. +Hint: Use {TabProfilesOp-keyall} to store and restore opened tabs.|Use the {TabProfilesOp-descr} command to store and restore opened tabs. diff -Nru worker-3.14.0/hints/hints-english.utf8 worker-3.15.4/hints/hints-english.utf8 --- worker-3.14.0/hints/hints-english.utf8 2017-12-08 22:28:17.000000000 +0000 +++ worker-3.15.4/hints/hints-english.utf8 2019-01-28 21:41:06.000000000 +0000 @@ -73,3 +73,8 @@ Hint: Add entries from the other panel into the current virtual dir by calling the command "vdir_add_selected_from_other_side". Hint: Enter filter expressions like (name=*.o&size>10k) with {SearchEntryOp}.|Hint: Enter filter expression like (name=*.o&size>10k) with the {SearchEntryOp-descr} command. Hint: See the command assigned to button by holding Control while clicking on it. +Hint: You can show files modified during the last day by filtering for (tm<1d). +Hint: Get a list of recently used files by pressing {ViewNewestFilesOp-keyall}.|Get a list of recently used files by using the {ViewNewestFilesOp-descr} command. +Hint: Change file filters directly by using the context menu. +Hint: Use the {DirCompareOp-descr} command to compare directories based on file size or content. +Hint: Use {TabProfilesOp-keyall} to store and restore opened tabs.|Use the {TabProfilesOp-descr} command to store and restore opened tabs. diff -Nru worker-3.14.0/hints/Makefile.in worker-3.15.4/hints/Makefile.in --- worker-3.14.0/hints/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/hints/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = hints -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -92,6 +101,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -145,6 +155,7 @@ am__installdirs = "$(DESTDIR)$(hintsdir)" DATA = $(hints_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -199,6 +210,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -316,7 +328,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hints/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu hints/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -515,6 +526,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-hintsDATA +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/Icons/Makefile.in worker-3.15.4/Icons/Makefile.in --- worker-3.14.0/Icons/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/Icons/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = Icons -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -92,6 +101,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -145,6 +155,7 @@ am__installdirs = "$(DESTDIR)$(Iconsdir)" DATA = $(Icons_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -199,6 +210,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -318,7 +330,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Icons/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Icons/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -518,6 +529,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-IconsDATA uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/install-sh worker-3.15.4/install-sh --- worker-3.14.0/install-sh 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/install-sh 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2016-01-11.22; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -522,6 +496,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru worker-3.14.0/ltmain.sh worker-3.15.4/ltmain.sh --- worker-3.14.0/ltmain.sh 2017-12-08 22:28:08.000000000 +0000 +++ worker-3.15.4/ltmain.sh 2019-01-28 21:40:58.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # 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. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program 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 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES 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 this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +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 else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_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\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +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 -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet 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. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet 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 () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program 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 3 of the License, or +# (at your option) any later version. + +# This program 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 this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval 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. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# 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 () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - 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 -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + 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" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru worker-3.14.0/m4/libtool.m4 worker-3.15.4/m4/libtool.m4 --- worker-3.14.0/m4/libtool.m4 2017-12-08 22:28:08.000000000 +0000 +++ worker-3.15.4/m4/libtool.m4 2019-01-28 21:40:58.000000000 +0000 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# 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. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# 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. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,30 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +746,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +780,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +797,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +995,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1013,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1031,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1053,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1063,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1108,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1150,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1168,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1188,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1217,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1246,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1266,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1281,33 @@ [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 +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1336,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,7 +1385,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -1369,19 +1437,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1389,7 +1458,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1398,7 +1467,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1414,7 +1483,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1433,11 +1502,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1445,7 +1514,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1476,7 +1545,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1512,7 +1581,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1539,7 +1608,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1561,7 +1630,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1580,10 +1649,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1604,7 +1673,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1644,7 +1713,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1694,22 +1763,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1725,7 +1795,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1753,7 +1823,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1800,9 +1870,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1828,7 +1898,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1849,7 +1919,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1859,44 +1929,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1905,21 +1983,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1929,7 +2007,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1939,9 +2017,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2033,8 +2111,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2044,8 +2122,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2072,8 +2150,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2085,15 +2163,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2107,12 +2185,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2136,7 +2214,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2154,6 +2232,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2164,17 +2283,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2190,28 +2310,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2225,7 +2352,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2234,7 +2361,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2251,14 +2378,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2266,41 +2396,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2310,18 +2490,18 @@ 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}' + 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=`func_echo_all "$lib" | $SED '\''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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $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' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2329,8 +2509,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2342,7 +2522,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2351,8 +2531,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2368,17 +2548,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2387,8 +2567,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2415,7 +2595,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2428,8 +2608,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2442,7 +2622,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2455,8 +2635,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2469,8 +2649,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2488,12 +2668,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2518,26 +2699,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2555,14 +2725,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2570,8 +2741,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2580,8 +2751,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2594,8 +2765,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2606,7 +2777,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2614,8 +2785,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2634,8 +2805,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2644,13 +2815,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2675,7 +2866,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -2695,12 +2891,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2710,7 +2906,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2719,58 +2915,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2781,8 +2987,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2792,11 +2998,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2804,8 +3010,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2826,24 +3032,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2861,7 +3067,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2869,8 +3075,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2879,20 +3085,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2925,39 +3141,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2980,11 +3198,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3002,7 +3220,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3029,16 +3247,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3052,7 +3270,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3063,37 +3281,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3179,13 +3434,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3212,8 +3467,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3249,10 +3503,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3291,7 +3541,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3313,8 +3563,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3367,6 +3617,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3407,33 +3660,38 @@ 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. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3444,21 +3702,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3466,8 +3724,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3513,8 +3771,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3526,7 +3784,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3553,13 +3811,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3571,11 +3844,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3594,7 +3867,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3646,7 +3919,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3679,14 +3952,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3704,21 +4007,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3758,11 +4064,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3788,7 +4094,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3808,9 +4114,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3831,7 +4137,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3858,12 +4164,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3879,17 +4189,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3900,8 +4211,8 @@ ;; 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'. + # 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 @@ -3917,6 +4228,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3966,7 +4282,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4007,14 +4323,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4043,7 +4359,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4051,7 +4367,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4196,17 +4512,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4217,8 +4534,8 @@ ;; 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'. + # 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 @@ -4235,6 +4552,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4305,7 +4627,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4313,11 +4635,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4333,7 +4674,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4342,9 +4683,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4369,6 +4710,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4466,7 +4813,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4495,7 +4842,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4561,17 +4908,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4617,9 +4968,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4635,7 +4986,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4643,7 +4994,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4653,7 +5004,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4675,24 +5026,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4705,7 +5056,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4724,7 +5075,7 @@ 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_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4740,7 +5091,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4750,7 +5101,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4758,61 +5109,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4823,42 +5202,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4872,8 +5256,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4891,8 +5275,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4904,7 +5288,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4919,9 +5303,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4938,15 +5322,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4962,7 +5346,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4970,34 +5354,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5016,13 +5423,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5041,61 +5456,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5104,7 +5538,7 @@ 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_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5134,16 +5568,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5152,18 +5587,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5172,7 +5607,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5222,33 +5657,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5256,25 +5691,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5282,14 +5717,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5300,7 +5735,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5311,16 +5746,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5333,21 +5768,31 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5362,7 +5807,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5370,27 +5815,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5401,33 +5838,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5438,24 +5895,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5465,11 +5922,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5479,10 +5936,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5531,43 +5988,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5582,17 +6039,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5609,7 +6066,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5689,12 +6146,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5735,10 +6192,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5778,18 +6235,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5797,8 +6254,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5806,13 +6267,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5820,14 +6281,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5869,7 +6330,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5911,35 +6372,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5975,18 +6436,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -5996,6 +6469,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6014,13 +6494,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6038,64 +6526,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6105,7 +6613,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6133,57 +6641,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6194,6 +6703,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6228,18 +6765,15 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6251,7 +6785,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6260,11 +6794,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6274,15 +6808,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6308,13 +6842,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6325,20 +6859,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6353,22 +6887,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6377,22 +6911,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6400,8 +6934,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6410,10 +6944,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6427,59 +6961,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6493,18 +7027,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6512,10 +7046,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6573,22 +7107,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6604,9 +7133,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6624,17 +7153,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6649,21 +7178,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6709,9 +7238,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6719,7 +7248,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6736,30 +7265,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6767,11 +7296,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6780,52 +7309,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6856,10 +7385,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6886,7 +7415,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6908,13 +7437,14 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6998,13 +7528,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7020,16 +7550,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7037,9 +7567,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7054,15 +7584,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7093,51 +7623,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7146,7 +7631,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7166,10 +7651,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7206,7 +7691,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7228,7 +7713,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7242,21 +7727,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7264,11 +7753,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7285,9 +7774,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7297,11 +7786,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7338,7 +7827,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7360,7 +7849,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7376,21 +7865,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7398,11 +7891,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7422,7 +7915,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7432,7 +7925,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7466,7 +7959,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7503,7 +7996,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7537,7 +8030,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7574,7 +8067,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7590,7 +8083,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7600,7 +8093,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7629,7 +8122,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7740,7 +8233,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7757,9 +8250,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7783,27 +8276,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7827,102 +8300,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff -Nru worker-3.14.0/m4/lt~obsolete.m4 worker-3.15.4/m4/lt~obsolete.m4 --- worker-3.14.0/m4/lt~obsolete.m4 2017-12-08 22:28:09.000000000 +0000 +++ worker-3.15.4/m4/lt~obsolete.m4 2019-01-28 21:40:58.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru worker-3.14.0/m4/ltoptions.m4 worker-3.15.4/m4/ltoptions.m4 --- worker-3.14.0/m4/ltoptions.m4 2017-12-08 22:28:08.000000000 +0000 +++ worker-3.15.4/m4/ltoptions.m4 2019-01-28 21:40:58.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _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.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru worker-3.14.0/m4/ltsugar.m4 worker-3.15.4/m4/ltsugar.m4 --- worker-3.14.0/m4/ltsugar.m4 2017-12-08 22:28:09.000000000 +0000 +++ worker-3.15.4/m4/ltsugar.m4 2019-01-28 21:40:58.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru worker-3.14.0/m4/ltversion.m4 worker-3.15.4/m4/ltversion.m4 --- worker-3.14.0/m4/ltversion.m4 2017-12-08 22:28:09.000000000 +0000 +++ worker-3.15.4/m4/ltversion.m4 2019-01-28 21:40:58.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru worker-3.14.0/m4/Makefile.in worker-3.15.4/m4/Makefile.in --- worker-3.14.0/m4/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/m4/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -91,6 +100,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -115,6 +125,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -169,6 +180,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -282,7 +294,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu m4/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -457,6 +468,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/Makefile.in worker-3.15.4/Makefile.in --- worker-3.14.0/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) COPYING THANKS \ - config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -94,6 +100,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -156,6 +164,9 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \ + INSTALL NEWS README THANKS compile config.guess config.sub \ + install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -251,6 +262,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -370,7 +382,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -570,7 +581,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 @@ -585,11 +596,17 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -607,7 +624,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -617,22 +634,23 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -808,6 +826,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/man/fr/Makefile.in worker-3.15.4/man/fr/Makefile.in --- worker-3.14.0/man/fr/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/man/fr/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = man/fr -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -91,6 +100,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -146,6 +156,7 @@ NROFF = nroff MANS = $(man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -200,6 +211,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -314,7 +326,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/fr/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu man/fr/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -538,6 +549,8 @@ ps ps-am tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/man/it/Makefile.in worker-3.15.4/man/it/Makefile.in --- worker-3.14.0/man/it/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/man/it/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = man/it -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -91,6 +100,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -146,6 +156,7 @@ NROFF = nroff MANS = $(man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -200,6 +211,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -314,7 +326,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/it/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu man/it/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -538,6 +549,8 @@ ps ps-am tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/man/Makefile.in worker-3.15.4/man/Makefile.in --- worker-3.14.0/man/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/man/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -91,6 +100,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -181,6 +191,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -260,6 +271,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -375,7 +387,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu man/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -719,6 +730,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-man uninstall-man1 +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/missing worker-3.15.4/missing --- worker-3.14.0/missing 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/missing 2019-01-28 21:41:03.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru worker-3.14.0/README worker-3.15.4/README --- worker-3.14.0/README 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/README 2019-01-28 21:40:22.000000000 +0000 @@ -1,4 +1,4 @@ -Worker 3.14.0 +Worker 3.15.4 ============= written by Ralf Hoffmann diff -Nru worker-3.14.0/scripts/displaywrapper_worker worker-3.15.4/scripts/displaywrapper_worker --- worker-3.14.0/scripts/displaywrapper_worker 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/scripts/displaywrapper_worker 2019-01-28 21:40:22.000000000 +0000 @@ -87,7 +87,7 @@ if test -n "$d"; then e=$(identify -ping "$6" 2>/dev/null) if test -n "$e"; then - display -geometry $3x$4+$1+$2 -foreground "$7" -window 0x$5 "$6" >/dev/null 2>/dev/null + convert "$6" png:- | display -geometry $3x$4+$1+$2 -foreground "$7" -window 0x$5 - >/dev/null 2>/dev/null fi fi fi diff -Nru worker-3.14.0/scripts/find_file_by_chksum.py worker-3.15.4/scripts/find_file_by_chksum.py --- worker-3.14.0/scripts/find_file_by_chksum.py 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/scripts/find_file_by_chksum.py 2019-01-28 21:40:22.000000000 +0000 @@ -0,0 +1,106 @@ +#! /usr/bin/env python +# +# This script outputs all files matching a given checksum + +from __future__ import print_function +import os +import hashlib +from optparse import OptionParser + +class FindByChksum: + + def __init__( self, options, args ): + self.__options = options + self.__args = args + + self.__verbose = options.verbose + self.__chksum = options.chksum + self.__type = options.type + self.__hash_limit = int( options.hash_limit ) + + self.__dir = args[0] + + def get_hash( self, filename ): + h = None + if os.path.isfile( filename ): + hasher = { + 'sha256': hashlib.sha256(), + 'md5': hashlib.md5() + }.get( self.__type, None ) + + if hasher: + bytes_read = 0 + with open( filename, "rb" ) as fh: + while True: + if self.__hash_limit > 0 and bytes_read >= self.__hash_limit: + break + l = 4096 + if self.__hash_limit > 0: + l = min( 4096, self.__hash_limit - bytes_read ) + buf = fh.read( l ) + if len( buf ) > 0: + hasher.update( buf ) + bytes_read += len( buf ) + else: + break + h = hasher.hexdigest() + return h + + def get_file_list( self, base_dir ): + res = [] + for base, dirs, files in os.walk( base_dir ): + for f in files: + full_name = os.path.join( base, f ) + + if self.__verbose: + print( "Processing %s" % ( full_name ) ) + + h = self.get_hash( full_name ) + if not h: + if self.__verbose: + print( "Skip %s due to failed chksum" % ( full_name ) ) + continue + + if self.__verbose: + print( "Got chksum %s for %s" % ( h, full_name ) ) + + if h == self.__chksum or h.startswith( self.__chksum ): + res.append( full_name ) + return res + + def find( self ): + if self.__verbose: + print( "Finding in %s" % ( self.__dir ) ) + + res = self.get_file_list( self.__dir ) + for f in res: + print( f ) + +if __name__ == "__main__": + parser = OptionParser( usage = "usage: %prog [options] " ) + parser.add_option( "-v", "--verbose", + action = "store_true", + dest = "verbose", + default = False, + help = "verbose output" ) + parser.add_option( "-l", "--limit", + action = "store", + dest = "hash_limit", + default = "0", + help = "set number of bytes used for hashingy" ) + parser.add_option( "-s", "--sum", + action = "store", + dest = "chksum", + default = "", + help = "set the chksum (or prefix of it) for comparison" ) + parser.add_option( "-t", "--type", + action = "store", + dest = "type", + default = "sha256", + help = "set the chksum type (sha256, md5)" ) + + ( options, args ) = parser.parse_args() + + s = FindByChksum( options, args ) + + s.find() diff -Nru worker-3.14.0/scripts/git_modified_files.sh worker-3.15.4/scripts/git_modified_files.sh --- worker-3.14.0/scripts/git_modified_files.sh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/scripts/git_modified_files.sh 2019-01-28 21:40:22.000000000 +0000 @@ -1,3 +1,3 @@ #! /bin/sh -git status --porcelain -uno | cut -c4- +git status --short -uno | cut -c4- diff -Nru worker-3.14.0/scripts/git_untracked_files.sh worker-3.15.4/scripts/git_untracked_files.sh --- worker-3.14.0/scripts/git_untracked_files.sh 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/scripts/git_untracked_files.sh 2019-01-28 21:40:22.000000000 +0000 @@ -0,0 +1,3 @@ +#! /bin/sh + +git status --short -unormal | grep '^??' | cut -c4- diff -Nru worker-3.14.0/scripts/Makefile.am worker-3.15.4/scripts/Makefile.am --- worker-3.14.0/scripts/Makefile.am 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/scripts/Makefile.am 2019-01-28 21:40:22.000000000 +0000 @@ -9,7 +9,9 @@ cd2mp3.sh \ cd2ogg.sh \ cd2wav.sh \ + find_file_by_chksum.py \ git_modified_files.sh \ + git_untracked_files.sh \ xeditor \ xliwrapper_worker diff -Nru worker-3.14.0/scripts/Makefile.in worker-3.15.4/scripts/Makefile.in --- worker-3.14.0/scripts/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/scripts/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,7 +93,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = scripts -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -96,6 +105,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -149,6 +159,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -203,6 +214,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -307,7 +319,9 @@ cd2mp3.sh \ cd2ogg.sh \ cd2wav.sh \ + find_file_by_chksum.py \ git_modified_files.sh \ + git_untracked_files.sh \ xeditor \ xliwrapper_worker @@ -327,7 +341,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu scripts/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -541,6 +554,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-scriptsSCRIPTS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/scripts/xliwrapper_worker worker-3.15.4/scripts/xliwrapper_worker --- worker-3.14.0/scripts/xliwrapper_worker 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/scripts/xliwrapper_worker 2019-01-28 21:40:22.000000000 +0000 @@ -87,7 +87,7 @@ if test -n "$d"; then e=$(identify -ping "$6" 2>/dev/null) if test -n "$e"; then - display -geometry $3x$4+$1+$2 -foreground "$7" -window 0x$5 "$6" >/dev/null 2>/dev/null + convert "$6" png:- | display -geometry $3x$4+$1+$2 -foreground "$7" -window 0x$5 - >/dev/null 2>/dev/null fi fi fi diff -Nru worker-3.14.0/src/about.cc worker-3.15.4/src/about.cc --- worker-3.14.0/src/about.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/about.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* about.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2011-2017 Ralf Hoffmann. + * Copyright (C) 2011-2019 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -92,7 +92,7 @@ ac1_texts->setMaxSpace( 5 ); ac1_texts->setBorderWidth( 5 ); - std::string str1 = AGUIXUtils::formatStringToString( "Worker %d.%d.%d%s|Copyright (C) 1998 - 2017 Ralf Hoffmann||Active options:", + std::string str1 = AGUIXUtils::formatStringToString( "Worker %d.%d.%d%s|Copyright (C) 1998 - 2019 Ralf Hoffmann||Active options:", WORKER_MAJOR, WORKER_MINOR, WORKER_PATCH, WORKER_COMMENT ); win->addMultiLineText( str1, *ac1_texts, 0, 0, NULL, NULL ); diff -Nru worker-3.14.0/src/aguix/aguix.cc worker-3.15.4/src/aguix/aguix.cc --- worker-3.14.0/src/aguix/aguix.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/aguix/aguix.cc 2019-01-28 21:40:22.000000000 +0000 @@ -41,6 +41,7 @@ #define BUBBLE_HELP_OPEN_TIME_MS ( 1 * 1000 ) #define BUBBLE_HELP_TIMEOUT_MS ( 1000 ) +#define XDND_TIMEOUT ( 5 ) #ifdef USE_XIM @@ -151,16 +152,21 @@ static bool worker_x_bad_window_occured() { bool v = s_badwindow_event_occurred; - s_ignore_badwindow_event = false; + s_badwindow_event_occurred = false; return v; } -void worker_x_ignore_next_bad_window_error() +void worker_x_ignore_bad_window_error() { s_badwindow_event_occurred = false; s_ignore_badwindow_event = true; } +void worker_x_handle_bad_window_error() +{ + s_ignore_badwindow_event = false; +} + AGUIX::AGUIX( int argc, char **argv, const std::string &classname ) : m_argc( argc ), m_argv( argv ), m_classname( classname ) @@ -791,6 +797,12 @@ newmsg->ack = false; newmsg->loop = 0; + if ( m_xdnd.drop_issued && + now - m_xdnd.last_activity > XDND_TIMEOUT ) { + cleanupDND(); + m_xdnd = aguix_xdnd_state(); + } + switch(LastEvent.type) { case MapNotify: case UnmapNotify: @@ -872,6 +884,7 @@ m.data.l[3] = 0; m.data.l[4] = 0; + worker_x_ignore_bad_window_error(); XSendEvent( dsp, m.window, False, NoEventMask, (XEvent*)&m ); @@ -918,7 +931,8 @@ m.data.l[3] = 0; m.data.l[4] = 0; - m_xdnd.drop_pending = true; + m_xdnd.drop_issued = true; + m_xdnd.last_activity = now; } else { // send leave m.window = m_xdnd.drag_current_proxy_target_window != None ? m_xdnd.drag_current_proxy_target_window : m_xdnd.drag_current_target_window; @@ -934,6 +948,7 @@ cleanupDND(); } + worker_x_ignore_bad_window_error(); XSendEvent( dsp, m.window, False, NoEventMask, (XEvent*)&m ); @@ -969,7 +984,7 @@ window = findXDNDAwareWindow( RootWindow( dsp, scr ), &proxy_window ); - worker_x_ignore_next_bad_window_error(); + worker_x_ignore_bad_window_error(); if ( window == None ) { // not dnd aware window @@ -1036,6 +1051,7 @@ m.data.l[3] = 0; m.data.l[4] = 0; + worker_x_ignore_bad_window_error(); XSendEvent( dsp, m.window, False, NoEventMask, (XEvent*)&m ); XFlush( dsp ); } @@ -1053,7 +1069,8 @@ m.data.l[2] = XA_TEXT_PLAIN; m.data.l[3] = XA_TEXT_URI_LIST; - XSendEvent( dsp, m.window, False, NoEventMask, (XEvent*)&m ); + worker_x_ignore_bad_window_error(); + XSendEvent( dsp, m.window, False, NoEventMask, (XEvent*)&m ); XFlush( dsp ); m_xdnd.position_silent = false; @@ -1064,15 +1081,18 @@ unsigned int utmp; Window wtmp; + worker_x_ignore_bad_window_error(); XQueryPointer( dsp, window, &wtmp, &wtmp, &x, &y, &tmp, &tmp, &utmp ); - - if ( m_xdnd.position_silent == false || - m_xdnd.position_silent_w == 0 || - m_xdnd.position_silent_h == 0 || - x < m_xdnd.position_silent_x || - x >= m_xdnd.position_silent_x + m_xdnd.position_silent_w || - y < m_xdnd.position_silent_y || - y >= m_xdnd.position_silent_y + m_xdnd.position_silent_h ) { + if ( worker_x_bad_window_occured() ) { + xdnd_version = -1; + window = None; + } else if ( m_xdnd.position_silent == false || + m_xdnd.position_silent_w == 0 || + m_xdnd.position_silent_h == 0 || + x < m_xdnd.position_silent_x || + x >= m_xdnd.position_silent_x + m_xdnd.position_silent_w || + y < m_xdnd.position_silent_y || + y >= m_xdnd.position_silent_y + m_xdnd.position_silent_h ) { XClientMessageEvent m; memset( &m, 0, sizeof( m ) ); m.type = ClientMessage; @@ -1086,10 +1106,11 @@ m.data.l[3] = CurrentTime; m.data.l[4] = XA_XDNDACTIONCOPY; + worker_x_ignore_bad_window_error(); XSendEvent( dsp, m.window, False, NoEventMask, (XEvent*)&m ); XFlush( dsp); - } else { - abort(); + + m_xdnd.drag_selection_pending = true; } } @@ -1222,11 +1243,13 @@ m.data.l[1] = 1; m.data.l[2] = XA_XDNDACTIONCOPY; + worker_x_ignore_bad_window_error(); XSendEvent( dsp, m_xdnd.source, False, NoEventMask, (XEvent*)&m ); + XFlush( dsp ); } prop.freeProperty(); @@ -1273,7 +1296,7 @@ } break; case SelectionRequest: - if ( m_xdnd.drop_pending && + if ( m_xdnd.drag_selection_pending && LastEvent.xselectionrequest.selection == XA_XDNDSELECTION ) { processSelectionRequest( &LastEvent ); } else { @@ -1289,7 +1312,7 @@ if( ( LastEvent.xselectionrequest.selection==XA_PRIMARY ) && ( LastEvent.xselectionrequest.target==XA_STRING ) ) { - worker_x_ignore_next_bad_window_error(); + worker_x_ignore_bad_window_error(); XChangeProperty(dsp, ev.xselection.requestor, @@ -1309,7 +1332,7 @@ UTF8::getUTF8Mode() != UTF8::UTF8_DISABLED && UTF8::getCurrentEncoding() == UTF8::ENCODING_UTF8 ) { - worker_x_ignore_next_bad_window_error(); + worker_x_ignore_bad_window_error(); XChangeProperty(dsp, ev.xselection.requestor, @@ -1328,7 +1351,7 @@ // send the list of supported atoms Atom supported_targets[] = { XA_TARGETS, XA_STRING, XA_UTF8_STRING }; - worker_x_ignore_next_bad_window_error(); + worker_x_ignore_bad_window_error(); XChangeProperty( dsp, ev.xselection.requestor, @@ -1346,7 +1369,9 @@ } if ( dont_send == false ) { + worker_x_ignore_bad_window_error(); XSendEvent(dsp,ev.xselection.requestor,False,0,&ev); + XFlush( dsp ); } } break; @@ -3729,8 +3754,6 @@ return true; } -#define XDND_TIMEOUT ( 2 * 60 ) - void AGUIX::handleXDNDEnter( XEvent *e ) { if ( m_xdnd.drop_active == true && @@ -3825,6 +3848,7 @@ m.data.l[3] = 0; m.data.l[4] = XA_XDNDACTIONCOPY; // we only support copy + worker_x_ignore_bad_window_error(); XSendEvent( dsp, xdnd_source, False, NoEventMask, (XEvent*)&m ); XFlush( dsp ); } @@ -3853,7 +3877,9 @@ m.data.l[1] = 0; m.data.l[2] = None; + worker_x_ignore_bad_window_error(); XSendEvent( dsp, xdnd_source, False, NoEventMask, (XEvent*)&m ); + XFlush( dsp ); return; } @@ -3892,7 +3918,7 @@ res.property_data = NULL; } - worker_x_ignore_next_bad_window_error(); + worker_x_ignore_bad_window_error(); if ( XGetWindowProperty( dsp, win, @@ -3997,7 +4023,7 @@ targets.push_back( XA_TEXT_URI_LIST ); targets.push_back( XA_TEXT_PLAIN ); - worker_x_ignore_next_bad_window_error(); + worker_x_ignore_bad_window_error(); XChangeProperty( dsp, w, property, XA_ATOM, 32, PropModeReplace, (unsigned char*)&targets[0], targets.size() ); @@ -4041,7 +4067,7 @@ } } - worker_x_ignore_next_bad_window_error(); + worker_x_ignore_bad_window_error(); XChangeProperty( dsp, requestor, property, target, 8, PropModeReplace, (const unsigned char*)res.c_str(), res.length() ); @@ -4055,7 +4081,9 @@ // not supported } + worker_x_ignore_bad_window_error(); XSendEvent( dsp, requestor, True, 0, &s ); + XFlush( dsp ); } Window AGUIX::findXDNDAwareWindow( Window w, Window *return_proxy_window ) @@ -4070,7 +4098,7 @@ return None; } - worker_x_ignore_next_bad_window_error(); + worker_x_ignore_bad_window_error(); prop_atoms = XListProperties( dsp, w, &nprops ); @@ -4177,6 +4205,8 @@ } m_xdnd.drag_initiator = NULL; } + + worker_x_handle_bad_window_error(); } void AGUIX::widgetDestroyed( Widget *w ) diff -Nru worker-3.14.0/src/aguix/aguixconfig.h.in worker-3.15.4/src/aguix/aguixconfig.h.in --- worker-3.14.0/src/aguix/aguixconfig.h.in 2017-12-08 22:28:12.000000000 +0000 +++ worker-3.15.4/src/aguix/aguixconfig.h.in 2019-01-28 21:41:02.000000000 +0000 @@ -246,8 +246,7 @@ /* Define to 1 when the prototype for XSetIMValues is available. */ #undef HAVE_XSETIMVALUES_PROTOTYPE -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Set to the maximum length of the command line */ diff -Nru worker-3.14.0/src/aguix/aguix.h worker-3.15.4/src/aguix/aguix.h --- worker-3.14.0/src/aguix/aguix.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/aguix/aguix.h 2019-01-28 21:40:22.000000000 +0000 @@ -555,7 +555,8 @@ drag_current_target_window( None ), drag_current_target_version( -1 ), drag_current_proxy_target_window( None ), - drop_pending( false ), + drag_selection_pending( false ), + drop_issued( false ), mouse_button( Button1 ), position_silent( false ), position_silent_x( 0 ), @@ -588,7 +589,8 @@ Window drag_current_proxy_target_window; - bool drop_pending; + bool drag_selection_pending; + bool drop_issued; unsigned int mouse_button; diff -Nru worker-3.14.0/src/aguix/Makefile.in worker-3.15.4/src/aguix/Makefile.in --- worker-3.14.0/src/aguix/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/src/aguix/Makefile.in 2019-01-28 21:41:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/aguix -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/aguixconfig.h.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = aguixconfig.h CONFIG_CLEAN_FILES = @@ -211,6 +220,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/aguixconfig.h.in \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -265,6 +276,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -481,7 +493,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/aguix/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/aguix/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -501,8 +512,8 @@ $(am__aclocal_m4_deps): aguixconfig.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/aguixconfig.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -808,6 +819,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru worker-3.14.0/src/aguix/textstorage.cc worker-3.15.4/src/aguix/textstorage.cc --- worker-3.14.0/src/aguix/textstorage.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/aguix/textstorage.cc 2019-01-28 21:40:22.000000000 +0000 @@ -90,109 +90,110 @@ void TextStorageString::initBuffer( const std::string &content, int line_limit_width ) { - unsigned int i; - int current_line = 0, current_subline = 0; + unsigned int i; + int current_line = 0, current_subline = 0; - if ( m_convert != NO_CHARACTER_CONVERSION ) { - m_raw_buffer = content; + if ( m_convert != NO_CHARACTER_CONVERSION ) { + m_raw_buffer = content; - convertRawData(); - } else { - buffer = content; - } - - line_offsets.clear(); - line_offsets.push_back( 0 ); - _real_lines.clear(); - _real_lines.push_back( std::pair( current_line, current_subline ) ); - m_line_width_cached.clear(); - - m_unwrapped_line_offsets.clear(); - m_unwrapped_line_offsets.push_back( 0 ); - - if ( line_limit_width < 1 ) { - // the easiest stuff: no line limit - for ( i = 0; i < buffer.length(); i++ ) { - if ( buffer[i] == '\n' ) { - current_line++; - - line_offsets.push_back( i + 1 ); // if newline is last character - // this line offset will be outside - // the buffer - m_unwrapped_line_offsets.push_back( i + 1 ); - _real_lines.push_back( std::pair( current_line, current_subline ) ); - } + convertRawData(); + } else { + buffer = content; } - } else { - unsigned int cur_line_width, token_width, token_characters; - bool newline; + + line_offsets.clear(); + line_offsets.push_back( 0 ); + _real_lines.clear(); + _real_lines.push_back( std::pair( current_line, current_subline ) ); + m_line_width_cached.clear(); + + m_unwrapped_line_offsets.clear(); + m_unwrapped_line_offsets.push_back( 0 ); + + if ( line_limit_width < 1 ) { + // the easiest stuff: no line limit + for ( i = 0; i < buffer.length(); i++ ) { + if ( buffer[i] == '\n' ) { + current_line++; + + line_offsets.push_back( i + 1 ); // if newline is last character + // this line offset will be outside + // the buffer + m_unwrapped_line_offsets.push_back( i + 1 ); + _real_lines.push_back( std::pair( current_line, current_subline ) ); + } + } + } else { + unsigned int cur_line_width, token_width, token_characters; + bool newline; - cur_line_width = 0; + cur_line_width = 0; - for ( i = 0; i < buffer.length();) { - newline = false; - if ( buffer[i] == '\n' ) { - newline = true; - i++; - - current_line++; - current_subline = 0; - } else { - token_characters = getTokenLen( i ); - if ( ( i + token_characters ) > buffer.length() ) { - token_characters = buffer.length() - i; - } + for ( i = 0; i < buffer.length();) { + newline = false; + if ( buffer[i] == '\n' ) { + newline = true; + i++; + + current_line++; + current_subline = 0; + } else { + // assume each character takes at least one pixel and use that as an upper limit + token_characters = getTokenLen( i, line_limit_width ); + if ( ( i + token_characters ) > buffer.length() ) { + token_characters = buffer.length() - i; + } - if ( token_characters < 1 ) - token_characters = UTF8::getLenOfCharacter( buffer.c_str() + i ); - if ( token_characters < 1 ) - token_characters = 1; + if ( token_characters < 1 ) + token_characters = UTF8::getLenOfCharacter( buffer.c_str() + i ); + if ( token_characters < 1 ) + token_characters = 1; - token_width = m_lencalc->getWidth( buffer.c_str() + i, token_characters ); + token_width = m_lencalc->getWidth( buffer.c_str() + i, token_characters ); - if ( ( cur_line_width + token_width ) <= (unsigned int)line_limit_width ) { - cur_line_width += token_width; - i += token_characters; - } else if ( cur_line_width == 0 ) { - // no character in current line and no space for whole token - // so split it - token_characters = m_lencalc->getStrlen4WidthMaxlen( buffer.c_str() + i, token_characters, - line_limit_width, NULL ); - - if ( token_characters < 1 ) { - // no room for at least one character at line start so we need to take - // this first one even this will break the line limit - token_characters = UTF8::getLenOfCharacter( buffer.c_str() + i ); - if ( token_characters < 1 ) - token_characters = 1; - } - i += token_characters; - newline = true; - - current_subline++; - } else { - newline = true; - // i is not advanced but for the newline cur_line_len will be 0 - // in the next round so the previous case will catch on if it - // doesn't fit + if ( ( cur_line_width + token_width ) <= (unsigned int)line_limit_width ) { + cur_line_width += token_width; + i += token_characters; + } else if ( cur_line_width == 0 ) { + // no character in current line and no space for whole token + // so split it + token_characters = m_lencalc->getStrlen4WidthMaxlen( buffer.c_str() + i, token_characters, + line_limit_width, NULL ); + + if ( token_characters < 1 ) { + // no room for at least one character at line start so we need to take + // this first one even this will break the line limit + token_characters = UTF8::getLenOfCharacter( buffer.c_str() + i ); + if ( token_characters < 1 ) + token_characters = 1; + } + i += token_characters; + newline = true; + + current_subline++; + } else { + newline = true; + // i is not advanced but for the newline cur_line_len will be 0 + // in the next round so the previous case will catch on if it + // doesn't fit - current_subline++; - } - } - if ( newline == true ) { - line_offsets.push_back( i ); - cur_line_width = 0; - - _real_lines.push_back( std::pair( current_line, current_subline ) ); - - if ( current_subline == 0 ) { - m_unwrapped_line_offsets.push_back( i ); + current_subline++; + } + } + if ( newline == true ) { + line_offsets.push_back( i ); + cur_line_width = 0; + + _real_lines.push_back( std::pair( current_line, current_subline ) ); + + if ( current_subline == 0 ) { + m_unwrapped_line_offsets.push_back( i ); + } + } } - } } - } - m_current_line_limit = line_limit_width; + m_current_line_limit = line_limit_width; } int TextStorageString::getMaxLineWidth() const @@ -245,24 +246,25 @@ return width; } -unsigned int TextStorageString::getTokenLen( unsigned int start_offset ) +unsigned int TextStorageString::getTokenLen( unsigned int start_offset, int limit ) { - unsigned int token_len; - size_t l; + unsigned int token_len; + size_t l; - if ( start_offset >= buffer.length() ) return 0; + if ( start_offset >= buffer.length() ) return 0; - for ( token_len = 0; start_offset < buffer.length(); ) { - if ( buffer[start_offset] == ' ' ) break; - if ( buffer[start_offset] == '\n' ) break; + for ( token_len = 0; start_offset < buffer.length(); ) { + if ( limit > 0 && token_len >= (unsigned int)limit ) break; + if ( buffer[start_offset] == ' ' ) break; + if ( buffer[start_offset] == '\n' ) break; - l = UTF8::getLenOfCharacter( buffer.c_str() + start_offset ); - start_offset += l; - token_len += l; - if ( l < 1 ) break; - } + l = UTF8::getLenOfCharacter( buffer.c_str() + start_offset ); + start_offset += l; + token_len += l; + if ( l < 1 ) break; + } - return token_len; + return token_len; } void TextStorageString::setLineLimit( int new_limit ) diff -Nru worker-3.14.0/src/aguix/textstorage.h worker-3.15.4/src/aguix/textstorage.h --- worker-3.14.0/src/aguix/textstorage.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/aguix/textstorage.h 2019-01-28 21:40:22.000000000 +0000 @@ -114,7 +114,7 @@ void setConvertMode( enum text_storage_converion convert ); private: void initBuffer( const std::string &content, int line_limit_width = -1 ); - unsigned int getTokenLen( unsigned int start_offset ); + unsigned int getTokenLen( unsigned int start_offset, int limit ); std::string getReplacementString( unsigned char ch, size_t column ) const; void convertRawData(); diff -Nru worker-3.14.0/src/aguix/textview.cc worker-3.15.4/src/aguix/textview.cc --- worker-3.14.0/src/aguix/textview.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/aguix/textview.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* textview.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2005-2015 Ralf Hoffmann. + * Copyright (C) 2005-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -49,7 +49,8 @@ tvcb( this ), _show_line_numbers( false ), m_buffer( 0 ), - m_show_frame( true ) + m_show_frame( true ), + m_last_mouse_time( 0 ) { hbar = vbar = NULL; cont = NULL; @@ -271,6 +272,18 @@ } else if ( msg->type == ButtonRelease && msg->window == win ) { if ( msg->button == Button1 ) { copySelectionToClipboard(); + + if ( _aguix->isDoubleClick( msg->time, m_last_mouse_time ) ) { + int mx, my; + + _aguix->queryPointer( win, &mx, &my ); + + handleDoubleClick( mx, my ); + + m_last_mouse_time = 0; + } else { + m_last_mouse_time = msg->time; + } } } @@ -958,6 +971,17 @@ m_selection.end_uline = m_selection.end_offset = -1; } +void TextView::selectAll() +{ + setSelectionStart( 0, 0 ); + + std::string line_str; + + ts.getLine( ts.getNrOfLines() - 1, 0, line_str ); + + setSelectionEnd( ts.getNrOfUnwrappedLines() - 1, (int)line_str.size() ); +} + void TextView::sizeChanged( int width, int height ) { AWindow::sizeChanged( width, height ); @@ -1144,6 +1168,11 @@ redraw(); } break; + case XK_a: + selectAll(); + copySelectionToClipboard(); + redraw(); + break; default: break; } @@ -1193,8 +1222,26 @@ if ( base_x < 0 ) base_x = 0; - int absolute_row = relative_row + vbar->getOffset(); + int absolute_row; + if ( relative_row >= 0 ) { + absolute_row = relative_row + vbar->getOffset(); + } else { + // stop at the first visible row + absolute_row = vbar->getOffset(); + base_x = 0; + } + + bool bottom_outside = false; + + if ( absolute_row >= ts.getNrOfLines() ) { + absolute_row = ts.getNrOfLines() - 1; + bottom_outside = true; + } else if ( relative_row >= vbar->getMaxDisplay() ) { + absolute_row = vbar->getOffset() + vbar->getMaxDisplay() - 1; + bottom_outside = true; + } + std::pair cur_line = ts.getRealLinePair( absolute_row ); if ( cur_line.first < 0 ) return cur_line; @@ -1214,7 +1261,12 @@ ts.getLine( absolute_row, 0, clicked_line ); - int offset_length = ts.getAWidth().getStrlen4WidthMaxlen( clicked_line.c_str(), base_x / 2, base_x, NULL ); + int offset_length; + if ( ! bottom_outside ) { + offset_length = ts.getAWidth().getStrlen4WidthMaxlen( clicked_line.c_str(), base_x / 2, base_x, NULL ); + } else { + offset_length = (int)clicked_line.size(); + } return std::make_pair( cur_line.first, prev_sublines_chars + offset_length ); } @@ -1266,3 +1318,57 @@ { m_show_frame = nv; } + +void TextView::handleDoubleClick( int mx, int my ) +{ + std::pair< int, int > cur = getTextPosForMousePos( mx, my ); + std::string line_str; + + if ( ts.getUnwrappedLine( cur.first, 0, -1, line_str ) != 0 ) { + return; + } + + int start_pos = cur.second; + int end_pos = cur.second; + int word_start = start_pos; + int word_end = end_pos; + + if ( start_pos < 0 || start_pos >= (int)line_str.size() ) return; + if ( end_pos < 0 || end_pos >= (int)line_str.size() ) return; + + for (;;) { + if ( std::isspace( line_str[ start_pos ] ) ) { + break; + } + + word_start = start_pos; + + UTF8::movePosToPrevChar( line_str.c_str(), start_pos ); + + if ( word_start == start_pos ) { + break; + } + } + + for (;;) { + word_end = end_pos; + + if ( end_pos >= (int)line_str.size() ) { + break; + } + if ( std::isspace( line_str[ end_pos ] ) ) { + break; + } + + UTF8::movePosToNextChar( line_str.c_str(), end_pos ); + + if ( word_end == end_pos ) { + break; + } + } + + setSelectionStart( cur.first, word_start ); + setSelectionEnd( cur.first, word_end ); + copySelectionToClipboard(); + redraw(); +} diff -Nru worker-3.14.0/src/aguix/textview.h worker-3.15.4/src/aguix/textview.h --- worker-3.14.0/src/aguix/textview.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/aguix/textview.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* textview.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2005-2015 Ralf Hoffmann. + * Copyright (C) 2005-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -110,6 +110,7 @@ void setSelectionEnd( int unwrapped_line_nr, int offset ); void getSelectionEnd( int &unwrapped_line_nr, int &offset ) const; void clearSelection(); + void selectAll(); void sizeChanged( int width, int height ); @@ -152,6 +153,8 @@ std::pair< int, int > m_button_press_unwrapped_line_pos; bool m_show_frame; + + Time m_last_mouse_time; void boxRedraw(); void createContainer(); @@ -184,6 +187,8 @@ std::pair< int, int > getTextPosForMousePos( int x, int y ); void copySelectionToClipboard(); + + void handleDoubleClick( int mx, int my ); }; #endif diff -Nru worker-3.14.0/src/aguix/util.cc worker-3.15.4/src/aguix/util.cc --- worker-3.14.0/src/aguix/util.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/aguix/util.cc 2019-01-28 21:40:22.000000000 +0000 @@ -536,7 +536,7 @@ ch == '/' ) { res += ch; } else { - res += formatStringToString( "%%%02x", ch ); + res += formatStringToString( "%%%02x", (unsigned char)ch ); } } diff -Nru worker-3.14.0/src/chmodop.cc worker-3.15.4/src/chmodop.cc --- worker-3.14.0/src/chmodop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/chmodop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* chmodop.c * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2014 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -311,3 +311,12 @@ requestflags=nv; } +bool ChModOp::isInteractiveRun() const +{ + return true; +} + +void ChModOp::setInteractiveRun() +{ + requestflags = true; +} diff -Nru worker-3.14.0/src/chmodop.h worker-3.15.4/src/chmodop.h --- worker-3.14.0/src/chmodop.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/chmodop.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* chmodop.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2004,2011 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -50,6 +50,8 @@ void setOnDirs(bool); void setRecursive(bool); void setRequestFlags(bool); + bool isInteractiveRun() const; + void setInteractiveRun(); protected: static const char *name; // Infos to save diff -Nru worker-3.14.0/src/chownop.cc worker-3.15.4/src/chownop.cc --- worker-3.14.0/src/chownop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/chownop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* chownop.c * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2014 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -312,3 +312,12 @@ requestflags = nv; } +bool ChOwnOp::isInteractiveRun() const +{ + return true; +} + +void ChOwnOp::setInteractiveRun() +{ + requestflags = true; +} diff -Nru worker-3.14.0/src/chownop.h worker-3.15.4/src/chownop.h --- worker-3.14.0/src/chownop.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/chownop.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* chownop.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2004,2011 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -50,6 +50,8 @@ void setOnDirs(bool); void setRecursive(bool); void setRequestFlags(bool); + bool isInteractiveRun() const; + void setInteractiveRun(); protected: static const char *name; // Infos to save diff -Nru worker-3.14.0/src/chtimeop.cc worker-3.15.4/src/chtimeop.cc --- worker-3.14.0/src/chtimeop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/chtimeop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* chtimeop.c * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2015 Ralf Hoffmann. + * Copyright (C) 2015-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -304,3 +304,13 @@ { m_requestflags = nv; } + +bool ChTimeOp::isInteractiveRun() const +{ + return true; +} + +void ChTimeOp::setInteractiveRun() +{ + m_requestflags = true; +} diff -Nru worker-3.14.0/src/chtimeop.hh worker-3.15.4/src/chtimeop.hh --- worker-3.14.0/src/chtimeop.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/chtimeop.hh 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* chtimeop.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2015 Ralf Hoffmann. + * Copyright (C) 2015-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -48,6 +48,8 @@ void setOnDirs(bool); void setRecursive(bool); void setRequestFlags(bool); + bool isInteractiveRun() const; + void setInteractiveRun(); static const char *name; protected: diff -Nru worker-3.14.0/src/configparser.cc worker-3.15.4/src/configparser.cc --- worker-3.14.0/src/configparser.cc 2017-12-08 22:28:40.000000000 +0000 +++ worker-3.15.4/src/configparser.cc 2019-01-28 21:41:43.000000000 +0000 @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + This program 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 3 of the License, or (at your option) any later version. - + This program 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 this program. If not, see . */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7" +#define YYBISON_VERSION "3.0.4" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -62,12 +62,11 @@ /* Copy the first part of user declarations. */ -/* Line 371 of yacc.c */ -#line 1 "configparser.yy" +#line 1 "configparser.yy" /* yacc.c:339 */ /* parser for config file (bison generated) * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2003-2017 Ralf Hoffmann. + * Copyright (C) 2003-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -283,14 +282,13 @@ /*#define YYERROR_VERBOSE*/ -/* Line 371 of yacc.c */ -#line 288 "configparser.cc" +#line 286 "configparser.cc" /* yacc.c:339 */ -# ifndef YY_NULL +# ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr +# define YY_NULLPTR nullptr # else -# define YY_NULL 0 +# define YY_NULLPTR 0 # endif # endif @@ -306,7 +304,7 @@ by #include "y.tab.h". */ #ifndef YY_YY_CONFIGPARSER_HH_INCLUDED # define YY_YY_CONFIGPARSER_HH_INCLUDED -/* Enabling traces. */ +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 #endif @@ -314,431 +312,435 @@ extern int yydebug; #endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - LEFTBRACE_WCP = 258, - RIGHTBRACE_WCP = 259, - GLOBAL_WCP = 260, - COLORS_WCP = 261, - LANG_WCP = 262, - PALETTE_WCP = 263, - OWNOP_WCP = 264, - LISTERSETS_WCP = 265, - YES_WCP = 266, - NO_WCP = 267, - LEFT_WCP = 268, - RIGHT_WCP = 269, - HBARTOP_WCP = 270, - HBARHEIGHT_WCP = 271, - VBARLEFT_WCP = 272, - VBARWIDTH_WCP = 273, - DISPLAYSETS_WCP = 274, - NAME_WCP = 275, - SIZE_WCP = 276, - TYPE_WCP = 277, - PERMISSION_WCP = 278, - OWNER_WCP = 279, - DESTINATION_WCP = 280, - MODTIME_WCP = 281, - ACCTIME_WCP = 282, - CHGTIME_WCP = 283, - ROWS_WCP = 284, - COLUMNS_WCP = 285, - CACHESIZE_WCP = 286, - OWNERSTYLE_WCP = 287, - TERMINAL_WCP = 288, - USESTRINGFORDIRSIZE_WCP = 289, - TIMESETS_WCP = 290, - STYLE1_WCP = 291, - STYLE2_WCP = 292, - STYLE3_WCP = 293, - DATE_WCP = 294, - TIME_WCP = 295, - DATESUBSTITUTION_WCP = 296, - DATEBEFORETIME_WCP = 297, - STATEBAR_WCP = 298, - SELLVBAR_WCP = 299, - UNSELLVBAR_WCP = 300, - CLOCKBAR_WCP = 301, - REQUESTER_WCP = 302, - UNSELDIR_WCP = 303, - SELDIR_WCP = 304, - UNSELFILE_WCP = 305, - SELFILE_WCP = 306, - UNSELACTDIR_WCP = 307, - SELACTDIR_WCP = 308, - UNSELACTFILE_WCP = 309, - SELACTFILE_WCP = 310, - LVBG_WCP = 311, - STARTUP_WCP = 312, - BUTTON_WCP = 313, - BUTTONS_WCP = 314, - POSITION_WCP = 315, - TITLE_WCP = 316, - COMMANDS_WCP = 317, - SHORTKEYS_WCP = 318, - PATHS_WCP = 319, - PATH_WCP = 320, - FILETYPES_WCP = 321, - FILETYPE_WCP = 322, - NORMAL_WCP = 323, - NOTYETCHECKED_WCP = 324, - UNKNOWN_WCP = 325, - NOSELECT_WCP = 326, - DIR_WCP = 327, - USEPATTERN_WCP = 328, - USECONTENT_WCP = 329, - PATTERN_WCP = 330, - CONTENT_WCP = 331, - FTCOMMANDS_WCP = 332, - DND_WCP = 333, - DC_WCP = 334, - SHOW_WCP = 335, - RAWSHOW_WCP = 336, - USER_WCP = 337, - FLAGS_WCP = 338, - IGNOREDIRS_WCP = 339, - HOTKEYS_WCP = 340, - HOTKEY_WCP = 341, - FONTS_WCP = 342, - GLOBALFONT_WCP = 343, - BUTTONFONT_WCP = 344, - LEFTFONT_WCP = 345, - RIGHTFONT_WCP = 346, - TEXTVIEWFONT_WCP = 347, - STATEBARFONT_WCP = 348, - CLOCKBARSETS_WCP = 349, - MODUS_WCP = 350, - TIMESPACE_WCP = 351, - VERSION_WCP = 352, - EXTERN_WCP = 353, - UPDATETIME_WCP = 354, - PROGRAM_WCP = 355, - SHOWHINTS_WCP = 356, - KEY_WCP = 357, - DOUBLE_WCP = 358, - MOD_WCP = 359, - CONTROL_WCP = 360, - SHIFT_WCP = 361, - LOCK_WCP = 362, - MOD1_WCP = 363, - MOD2_WCP = 364, - MOD3_WCP = 365, - MOD4_WCP = 366, - MOD5_WCP = 367, - DNDACTION_WCP = 368, - DCACTION_WCP = 369, - SHOWACTION_WCP = 370, - RSHOWACTION_WCP = 371, - USERACTION_WCP = 372, - ROWUP_WCP = 373, - ROWDOWN_WCP = 374, - CHANGEHIDDENFLAG_WCP = 375, - COPYOP_WCP = 376, - FIRSTROW_WCP = 377, - LASTROW_WCP = 378, - PAGEUP_WCP = 379, - PAGEDOWN_WCP = 380, - SELECTOP_WCP = 381, - SELECTALLOP_WCP = 382, - SELECTNONEOP_WCP = 383, - INVERTALLOP_WCP = 384, - PARENTDIROP_WCP = 385, - ENTERDIROP_WCP = 386, - CHANGELISTERSETOP_WCP = 387, - SWITCHLISTEROP_WCP = 388, - FILTERSELECTOP_WCP = 389, - FILTERUNSELECTOP_WCP = 390, - PATHTOOTHERSIDEOP_WCP = 391, - QUITOP_WCP = 392, - DELETEOP_WCP = 393, - RELOADOP_WCP = 394, - MAKEDIROP_WCP = 395, - RENAMEOP_WCP = 396, - DIRSIZEOP_WCP = 397, - SIMDDOP_WCP = 398, - STARTPROGOP_WCP = 399, - SEARCHENTRYOP_WCP = 400, - ENTERPATHOP_WCP = 401, - SCROLLLISTEROP_WCP = 402, - CREATESYMLINKOP_WCP = 403, - CHANGESYMLINKOP_WCP = 404, - CHMODOP_WCP = 405, - TOGGLELISTERMODEOP_WCP = 406, - SETSORTMODEOP_WCP = 407, - SETFILTEROP_WCP = 408, - SHORTKEYFROMLISTOP_WCP = 409, - CHOWNOP_WCP = 410, - WORKERCONFIG_WCP = 411, - USERSTYLE_WCP = 412, - DATESTRING_WCP = 413, - TIMESTRING_WCP = 414, - COLOR_WCP = 415, - PATTERNIGNORECASE_WCP = 416, - PATTERNUSEREGEXP_WCP = 417, - PATTERNUSEFULLNAME_WCP = 418, - COM_WCP = 419, - SEPARATEEACHENTRY_WCP = 420, - RECURSIVE_WCP = 421, - START_WCP = 422, - TERMINALWAIT_WCP = 423, - SHOWOUTPUT_WCP = 424, - VIEWSTR_WCP = 425, - SHOWOUTPUTINT_WCP = 426, - INBACKGROUND_WCP = 427, - TAKEDIRS_WCP = 428, - ACTIONNUMBER_WCP = 429, - HIDDENFILES_WCP = 430, - HIDE_WCP = 431, - TOGGLE_WCP = 432, - FOLLOWSYMLINKS_WCP = 433, - MOVE_WCP = 434, - RENAME_WCP = 435, - SAMEDIR_WCP = 436, - REQUESTDEST_WCP = 437, - REQUESTFLAGS_WCP = 438, - OVERWRITE_WCP = 439, - ALWAYS_WCP = 440, - NEVER_WCP = 441, - COPYMODE_WCP = 442, - FAST_WCP = 443, - PRESERVEATTR_WCP = 444, - MODE_WCP = 445, - ACTIVE_WCP = 446, - ACTIVE2OTHER_WCP = 447, - SPECIAL_WCP = 448, - REQUEST_WCP = 449, - CURRENT_WCP = 450, - OTHER_WCP = 451, - FILTER_WCP = 452, - QUICK_WCP = 453, - ALSOACTIVE_WCP = 454, - RESETDIRSIZES_WCP = 455, - KEEPFILETYPES_WCP = 456, - RELATIVE_WCP = 457, - ONFILES_WCP = 458, - ONDIRS_WCP = 459, - SORTBY_WCP = 460, - SORTFLAG_WCP = 461, - REVERSE_WCP = 462, - DIRLAST_WCP = 463, - DIRMIXED_WCP = 464, - EXCLUDE_WCP = 465, - INCLUDE_WCP = 466, - UNSET_WCP = 467, - UNSETALL_WCP = 468, - SCRIPTOP_WCP = 469, - NOP_WCP = 470, - PUSH_WCP = 471, - LABEL_WCP = 472, - IF_WCP = 473, - END_WCP = 474, - POP_WCP = 475, - SETTINGS_WCP = 476, - WINDOW_WCP = 477, - GOTO_WCP = 478, - PUSHUSEOUTPUT_WCP = 479, - DODEBUG_WCP = 480, - WPURECURSIVE_WCP = 481, - WPUTAKEDIRS_WCP = 482, - STACKNR_WCP = 483, - PUSHSTRING_WCP = 484, - IFTEST_WCP = 485, - IFLABEL_WCP = 486, - WINTYPE_WCP = 487, - OPEN_WCP = 488, - CLOSE_WCP = 489, - LEAVE_WCP = 490, - CHANGEPROGRESS_WCP = 491, - CHANGETEXT_WCP = 492, - PROGRESSUSEOUTPUT_WCP = 493, - WINTEXTUSEOUTPUT_WCP = 494, - PROGRESS_WCP = 495, - WINTEXT_WCP = 496, - SHOWDIRCACHEOP_WCP = 497, - INODE_WCP = 498, - NLINK_WCP = 499, - BLOCKS_WCP = 500, - SHOWHEADER_WCP = 501, - LVHEADER_WCP = 502, - IGNORECASE_WCP = 503, - LISTVIEWS_WCP = 504, - BLL_WCP = 505, - LBL_WCP = 506, - LLB_WCP = 507, - BL_WCP = 508, - LB_WCP = 509, - LAYOUT_WCP = 510, - BUTTONSVERT_WCP = 511, - LISTVIEWSVERT_WCP = 512, - LISTVIEWWEIGHT_WCP = 513, - WEIGHTTOACTIVE_WCP = 514, - EXTCOND_WCP = 515, - USEEXTCOND_WCP = 516, - SUBTYPE_WCP = 517, - PARENTACTIONOP_WCP = 518, - NOOPERATIONOP_WCP = 519, - COLORMODE_WCP = 520, - DEFAULT_WCP = 521, - CUSTOM_WCP = 522, - UNSELECTCOLOR_WCP = 523, - SELECTCOLOR_WCP = 524, - UNSELECTACTIVECOLOR_WCP = 525, - SELECTACTIVECOLOR_WCP = 526, - COLOREXTERNPROG_WCP = 527, - PARENT_WCP = 528, - DONTCD_WCP = 529, - DONTCHECKVIRTUAL_WCP = 530, - GOFTPOP_WCP = 531, - HOSTNAME_WCP = 532, - USERNAME_WCP = 533, - PASSWORD_WCP = 534, - DONTENTERFTP_WCP = 535, - ALWAYSSTOREPW_WCP = 536, - INTERNALVIEWOP_WCP = 537, - CUSTOMFILES_WCP = 538, - SHOWMODE_WCP = 539, - SELECTED_WCP = 540, - REVERSESEARCH_WCP = 541, - MOUSECONF_WCP = 542, - SELECTBUTTON_WCP = 543, - ACTIVATEBUTTON_WCP = 544, - SCROLLBUTTON_WCP = 545, - SELECTMETHOD_WCP = 546, - ALTERNATIVE_WCP = 547, - SEARCHOP_WCP = 548, - EDITCOMMAND_WCP = 549, - SHOWPREVRESULTS_WCP = 550, - TEXTVIEW_WCP = 551, - TEXTVIEWHIGHLIGHTED_WCP = 552, - TEXTVIEWSELECTION_WCP = 553, - DIRBOOKMARKOP_WCP = 554, - OPENCONTEXTMENUOP_WCP = 555, - RUNCUSTOMACTION_WCP = 556, - CUSTOMNAME_WCP = 557, - CONTEXTBUTTON_WCP = 558, - ACTIVATEMOD_WCP = 559, - SCROLLMOD_WCP = 560, - CONTEXTMOD_WCP = 561, - NONE_WCP = 562, - CUSTOMACTION_WCP = 563, - SAVE_WORKER_STATE_ON_EXIT_WCP = 564, - OPENWORKERMENUOP_WCP = 565, - CHANGELABELOP_WCP = 566, - ASKFORLABEL_WCP = 567, - LABELCOLORS_WCP = 568, - BOOKMARKLABEL_WCP = 569, - BOOKMARKFILTER_WCP = 570, - SHOWONLYBOOKMARKS_WCP = 571, - SHOWONLYLABEL_WCP = 572, - SHOWALL_WCP = 573, - OPTIONMODE_WCP = 574, - INVERT_WCP = 575, - SET_WCP = 576, - CHANGEFILTERS_WCP = 577, - CHANGEBOOKMARKS_WCP = 578, - QUERYLABEL_WCP = 579, - MODIFYTABSOP_WCP = 580, - TABACTION_WCP = 581, - NEWTAB_WCP = 582, - CLOSECURRENTTAB_WCP = 583, - NEXTTAB_WCP = 584, - PREVTAB_WCP = 585, - CHANGELAYOUTOP_WCP = 586, - INFIXSEARCH_WCP = 587, - VOLUMEMANAGEROP_WCP = 588, - ERROR = 589, - ACTIVESIDE_WCP = 590, - SHOWFREESPACE_WCP = 591, - ACTIVEMODE_WCP = 592, - ASK_WCP = 593, - SSHALLOW_WCP = 594, - FIELD_WIDTH_WCP = 595, - QUICKSEARCHENABLED_WCP = 596, - FILTEREDSEARCHENABLED_WCP = 597, - XFTFONTS_WCP = 598, - USEMAGIC_WCP = 599, - MAGICPATTERN_WCP = 600, - MAGICCOMPRESSED_WCP = 601, - MAGICMIME_WCP = 602, - VOLUMEMANAGER_WCP = 603, - MOUNTCOMMAND_WCP = 604, - UNMOUNTCOMMAND_WCP = 605, - FSTABFILE_WCP = 606, - MTABFILE_WCP = 607, - PARTFILE_WCP = 608, - REQUESTACTION_WCP = 609, - SIZEH_WCP = 610, - NEXTAGING_WCP = 611, - ENTRY_WCP = 612, - PREFIX_WCP = 613, - VALUE_WCP = 614, - EJECTCOMMAND_WCP = 615, - CLOSETRAYCOMMAND_WCP = 616, - AVFSMODULE_WCP = 617, - FLEXIBLEMATCH_WCP = 618, - USE_VERSION_STRING_COMPARE_WCP = 619, - SWITCHBUTTONBANKOP_WCP = 620, - SWITCHTONEXTBANK_WCP = 621, - SWITCHTOPREVBANK_WCP = 622, - SWITCHTOBANKNR_WCP = 623, - BANKNR_WCP = 624, - USE_VIRTUAL_TEMP_COPIES_WCP = 625, - PATHJUMPOP_WCP = 626, - PATHJUMPALLOWDIRS_WCP = 627, - CLIPBOARDOP_WCP = 628, - CLIPBOARDSTRING_WCP = 629, - COMMANDSTRING_WCP = 630, - EVALCOMMAND_WCP = 631, - WATCHMODE_WCP = 632, - APPLY_WINDOW_DIALOG_TYPE_WCP = 633, - FLAGS_ARE_RELATIVE_TO_BASEDIR_WCP = 634, - COMMANDMENUOP_WCP = 635, - SEARCHMODEONKEYPRESS_WCP = 636, - PATHENTRYONTOP_WCP = 637, - STORE_FILES_ALWAYS_WCP = 638, - PATHJUMPSETS_WCP = 639, - SHOWDOTDOT_WCP = 640, - SHOWBREADCRUMB_WCP = 641, - FACES_WCP = 642, - FACE_WCP = 643, - ENABLE_INFO_LINE_WCP = 644, - INFO_LINE_LUA_MODE_WCP = 645, - INFO_LINE_CONTENT_WCP = 646, - RESTORE_TABS_MODE_WCP = 647, - STORE_TABS_MODE_WCP = 648, - AS_EXIT_STATE_WCP = 649, - USE_EXTENDED_REGEX_WCP = 650, - HIGHLIGHT_USER_ACTION_WCP = 651, - CHTIMEOP_WCP = 652, - ADJUSTRELATIVESYMLINKS_WCP = 653, - OUTSIDE_WCP = 654, - EDIT_WCP = 655, - MAKEABSOLUTE_WCP = 656, - MAKERELATIVE_WCP = 657, - MAGICIGNORECASE_WCP = 658, - ENSURE_FILE_PERMISSIONS_WCP = 659, - USER_RW_WCP = 660, - USER_RW_GROUP_R_WCP = 661, - USER_RW_ALL_R_WCP = 662, - LEAVE_UNMODIFIED_WCP = 663, - PREFERUDISKSVERSION_WCP = 664, - CHANGECOLUMNSOP_WCP = 665, - PATTERNISCOMMASEPARATED_WCP = 666, - STRCASECMP_WCP = 667, - USE_STRING_COMPARE_MODE_WCP = 668, - VIEWNEWESTFILESOP_WCP = 669, - SHOWRECENT_WCP = 670, - DIRCOMPAREOP_WCP = 671, - TABPROFILESOP_WCP = 672, - EXTERNALVDIROP_WCP = 673, - STRING_WCP = 674, - NUM_WCP = 675 - }; + enum yytokentype + { + LEFTBRACE_WCP = 258, + RIGHTBRACE_WCP = 259, + GLOBAL_WCP = 260, + COLORS_WCP = 261, + LANG_WCP = 262, + PALETTE_WCP = 263, + OWNOP_WCP = 264, + LISTERSETS_WCP = 265, + YES_WCP = 266, + NO_WCP = 267, + LEFT_WCP = 268, + RIGHT_WCP = 269, + HBARTOP_WCP = 270, + HBARHEIGHT_WCP = 271, + VBARLEFT_WCP = 272, + VBARWIDTH_WCP = 273, + DISPLAYSETS_WCP = 274, + NAME_WCP = 275, + SIZE_WCP = 276, + TYPE_WCP = 277, + PERMISSION_WCP = 278, + OWNER_WCP = 279, + DESTINATION_WCP = 280, + MODTIME_WCP = 281, + ACCTIME_WCP = 282, + CHGTIME_WCP = 283, + ROWS_WCP = 284, + COLUMNS_WCP = 285, + CACHESIZE_WCP = 286, + OWNERSTYLE_WCP = 287, + TERMINAL_WCP = 288, + USESTRINGFORDIRSIZE_WCP = 289, + TIMESETS_WCP = 290, + STYLE1_WCP = 291, + STYLE2_WCP = 292, + STYLE3_WCP = 293, + DATE_WCP = 294, + TIME_WCP = 295, + DATESUBSTITUTION_WCP = 296, + DATEBEFORETIME_WCP = 297, + STATEBAR_WCP = 298, + SELLVBAR_WCP = 299, + UNSELLVBAR_WCP = 300, + CLOCKBAR_WCP = 301, + REQUESTER_WCP = 302, + UNSELDIR_WCP = 303, + SELDIR_WCP = 304, + UNSELFILE_WCP = 305, + SELFILE_WCP = 306, + UNSELACTDIR_WCP = 307, + SELACTDIR_WCP = 308, + UNSELACTFILE_WCP = 309, + SELACTFILE_WCP = 310, + LVBG_WCP = 311, + STARTUP_WCP = 312, + BUTTON_WCP = 313, + BUTTONS_WCP = 314, + POSITION_WCP = 315, + TITLE_WCP = 316, + COMMANDS_WCP = 317, + SHORTKEYS_WCP = 318, + PATHS_WCP = 319, + PATH_WCP = 320, + FILETYPES_WCP = 321, + FILETYPE_WCP = 322, + NORMAL_WCP = 323, + NOTYETCHECKED_WCP = 324, + UNKNOWN_WCP = 325, + NOSELECT_WCP = 326, + DIR_WCP = 327, + USEPATTERN_WCP = 328, + USECONTENT_WCP = 329, + PATTERN_WCP = 330, + CONTENT_WCP = 331, + FTCOMMANDS_WCP = 332, + DND_WCP = 333, + DC_WCP = 334, + SHOW_WCP = 335, + RAWSHOW_WCP = 336, + USER_WCP = 337, + FLAGS_WCP = 338, + IGNOREDIRS_WCP = 339, + HOTKEYS_WCP = 340, + HOTKEY_WCP = 341, + FONTS_WCP = 342, + GLOBALFONT_WCP = 343, + BUTTONFONT_WCP = 344, + LEFTFONT_WCP = 345, + RIGHTFONT_WCP = 346, + TEXTVIEWFONT_WCP = 347, + STATEBARFONT_WCP = 348, + CLOCKBARSETS_WCP = 349, + MODUS_WCP = 350, + TIMESPACE_WCP = 351, + VERSION_WCP = 352, + EXTERN_WCP = 353, + UPDATETIME_WCP = 354, + PROGRAM_WCP = 355, + SHOWHINTS_WCP = 356, + KEY_WCP = 357, + DOUBLE_WCP = 358, + MOD_WCP = 359, + CONTROL_WCP = 360, + SHIFT_WCP = 361, + LOCK_WCP = 362, + MOD1_WCP = 363, + MOD2_WCP = 364, + MOD3_WCP = 365, + MOD4_WCP = 366, + MOD5_WCP = 367, + DNDACTION_WCP = 368, + DCACTION_WCP = 369, + SHOWACTION_WCP = 370, + RSHOWACTION_WCP = 371, + USERACTION_WCP = 372, + ROWUP_WCP = 373, + ROWDOWN_WCP = 374, + CHANGEHIDDENFLAG_WCP = 375, + COPYOP_WCP = 376, + FIRSTROW_WCP = 377, + LASTROW_WCP = 378, + PAGEUP_WCP = 379, + PAGEDOWN_WCP = 380, + SELECTOP_WCP = 381, + SELECTALLOP_WCP = 382, + SELECTNONEOP_WCP = 383, + INVERTALLOP_WCP = 384, + PARENTDIROP_WCP = 385, + ENTERDIROP_WCP = 386, + CHANGELISTERSETOP_WCP = 387, + SWITCHLISTEROP_WCP = 388, + FILTERSELECTOP_WCP = 389, + FILTERUNSELECTOP_WCP = 390, + PATHTOOTHERSIDEOP_WCP = 391, + QUITOP_WCP = 392, + DELETEOP_WCP = 393, + RELOADOP_WCP = 394, + MAKEDIROP_WCP = 395, + RENAMEOP_WCP = 396, + DIRSIZEOP_WCP = 397, + SIMDDOP_WCP = 398, + STARTPROGOP_WCP = 399, + SEARCHENTRYOP_WCP = 400, + ENTERPATHOP_WCP = 401, + SCROLLLISTEROP_WCP = 402, + CREATESYMLINKOP_WCP = 403, + CHANGESYMLINKOP_WCP = 404, + CHMODOP_WCP = 405, + TOGGLELISTERMODEOP_WCP = 406, + SETSORTMODEOP_WCP = 407, + SETFILTEROP_WCP = 408, + SHORTKEYFROMLISTOP_WCP = 409, + CHOWNOP_WCP = 410, + WORKERCONFIG_WCP = 411, + USERSTYLE_WCP = 412, + DATESTRING_WCP = 413, + TIMESTRING_WCP = 414, + COLOR_WCP = 415, + PATTERNIGNORECASE_WCP = 416, + PATTERNUSEREGEXP_WCP = 417, + PATTERNUSEFULLNAME_WCP = 418, + COM_WCP = 419, + SEPARATEEACHENTRY_WCP = 420, + RECURSIVE_WCP = 421, + START_WCP = 422, + TERMINALWAIT_WCP = 423, + SHOWOUTPUT_WCP = 424, + VIEWSTR_WCP = 425, + SHOWOUTPUTINT_WCP = 426, + INBACKGROUND_WCP = 427, + TAKEDIRS_WCP = 428, + ACTIONNUMBER_WCP = 429, + HIDDENFILES_WCP = 430, + HIDE_WCP = 431, + TOGGLE_WCP = 432, + FOLLOWSYMLINKS_WCP = 433, + MOVE_WCP = 434, + RENAME_WCP = 435, + SAMEDIR_WCP = 436, + REQUESTDEST_WCP = 437, + REQUESTFLAGS_WCP = 438, + OVERWRITE_WCP = 439, + ALWAYS_WCP = 440, + NEVER_WCP = 441, + COPYMODE_WCP = 442, + FAST_WCP = 443, + PRESERVEATTR_WCP = 444, + MODE_WCP = 445, + ACTIVE_WCP = 446, + ACTIVE2OTHER_WCP = 447, + SPECIAL_WCP = 448, + REQUEST_WCP = 449, + CURRENT_WCP = 450, + OTHER_WCP = 451, + FILTER_WCP = 452, + QUICK_WCP = 453, + ALSOACTIVE_WCP = 454, + RESETDIRSIZES_WCP = 455, + KEEPFILETYPES_WCP = 456, + RELATIVE_WCP = 457, + ONFILES_WCP = 458, + ONDIRS_WCP = 459, + SORTBY_WCP = 460, + SORTFLAG_WCP = 461, + REVERSE_WCP = 462, + DIRLAST_WCP = 463, + DIRMIXED_WCP = 464, + EXCLUDE_WCP = 465, + INCLUDE_WCP = 466, + UNSET_WCP = 467, + UNSETALL_WCP = 468, + SCRIPTOP_WCP = 469, + NOP_WCP = 470, + PUSH_WCP = 471, + LABEL_WCP = 472, + IF_WCP = 473, + END_WCP = 474, + POP_WCP = 475, + SETTINGS_WCP = 476, + WINDOW_WCP = 477, + GOTO_WCP = 478, + PUSHUSEOUTPUT_WCP = 479, + DODEBUG_WCP = 480, + WPURECURSIVE_WCP = 481, + WPUTAKEDIRS_WCP = 482, + STACKNR_WCP = 483, + PUSHSTRING_WCP = 484, + IFTEST_WCP = 485, + IFLABEL_WCP = 486, + WINTYPE_WCP = 487, + OPEN_WCP = 488, + CLOSE_WCP = 489, + LEAVE_WCP = 490, + CHANGEPROGRESS_WCP = 491, + CHANGETEXT_WCP = 492, + PROGRESSUSEOUTPUT_WCP = 493, + WINTEXTUSEOUTPUT_WCP = 494, + PROGRESS_WCP = 495, + WINTEXT_WCP = 496, + SHOWDIRCACHEOP_WCP = 497, + INODE_WCP = 498, + NLINK_WCP = 499, + BLOCKS_WCP = 500, + SHOWHEADER_WCP = 501, + LVHEADER_WCP = 502, + IGNORECASE_WCP = 503, + LISTVIEWS_WCP = 504, + BLL_WCP = 505, + LBL_WCP = 506, + LLB_WCP = 507, + BL_WCP = 508, + LB_WCP = 509, + LAYOUT_WCP = 510, + BUTTONSVERT_WCP = 511, + LISTVIEWSVERT_WCP = 512, + LISTVIEWWEIGHT_WCP = 513, + WEIGHTTOACTIVE_WCP = 514, + EXTCOND_WCP = 515, + USEEXTCOND_WCP = 516, + SUBTYPE_WCP = 517, + PARENTACTIONOP_WCP = 518, + NOOPERATIONOP_WCP = 519, + COLORMODE_WCP = 520, + DEFAULT_WCP = 521, + CUSTOM_WCP = 522, + UNSELECTCOLOR_WCP = 523, + SELECTCOLOR_WCP = 524, + UNSELECTACTIVECOLOR_WCP = 525, + SELECTACTIVECOLOR_WCP = 526, + COLOREXTERNPROG_WCP = 527, + PARENT_WCP = 528, + DONTCD_WCP = 529, + DONTCHECKVIRTUAL_WCP = 530, + GOFTPOP_WCP = 531, + HOSTNAME_WCP = 532, + USERNAME_WCP = 533, + PASSWORD_WCP = 534, + DONTENTERFTP_WCP = 535, + ALWAYSSTOREPW_WCP = 536, + INTERNALVIEWOP_WCP = 537, + CUSTOMFILES_WCP = 538, + SHOWMODE_WCP = 539, + SELECTED_WCP = 540, + REVERSESEARCH_WCP = 541, + MOUSECONF_WCP = 542, + SELECTBUTTON_WCP = 543, + ACTIVATEBUTTON_WCP = 544, + SCROLLBUTTON_WCP = 545, + SELECTMETHOD_WCP = 546, + ALTERNATIVE_WCP = 547, + SEARCHOP_WCP = 548, + EDITCOMMAND_WCP = 549, + SHOWPREVRESULTS_WCP = 550, + TEXTVIEW_WCP = 551, + TEXTVIEWHIGHLIGHTED_WCP = 552, + TEXTVIEWSELECTION_WCP = 553, + DIRBOOKMARKOP_WCP = 554, + OPENCONTEXTMENUOP_WCP = 555, + RUNCUSTOMACTION_WCP = 556, + CUSTOMNAME_WCP = 557, + CONTEXTBUTTON_WCP = 558, + ACTIVATEMOD_WCP = 559, + SCROLLMOD_WCP = 560, + CONTEXTMOD_WCP = 561, + NONE_WCP = 562, + CUSTOMACTION_WCP = 563, + SAVE_WORKER_STATE_ON_EXIT_WCP = 564, + OPENWORKERMENUOP_WCP = 565, + CHANGELABELOP_WCP = 566, + ASKFORLABEL_WCP = 567, + LABELCOLORS_WCP = 568, + BOOKMARKLABEL_WCP = 569, + BOOKMARKFILTER_WCP = 570, + SHOWONLYBOOKMARKS_WCP = 571, + SHOWONLYLABEL_WCP = 572, + SHOWALL_WCP = 573, + OPTIONMODE_WCP = 574, + INVERT_WCP = 575, + SET_WCP = 576, + CHANGEFILTERS_WCP = 577, + CHANGEBOOKMARKS_WCP = 578, + QUERYLABEL_WCP = 579, + MODIFYTABSOP_WCP = 580, + TABACTION_WCP = 581, + NEWTAB_WCP = 582, + CLOSECURRENTTAB_WCP = 583, + NEXTTAB_WCP = 584, + PREVTAB_WCP = 585, + TOGGLELOCKSTATE_WCP = 586, + MOVETABLEFT_WCP = 587, + MOVETABRIGHT_WCP = 588, + CHANGELAYOUTOP_WCP = 589, + INFIXSEARCH_WCP = 590, + VOLUMEMANAGEROP_WCP = 591, + ERROR = 592, + ACTIVESIDE_WCP = 593, + SHOWFREESPACE_WCP = 594, + ACTIVEMODE_WCP = 595, + ASK_WCP = 596, + SSHALLOW_WCP = 597, + FIELD_WIDTH_WCP = 598, + QUICKSEARCHENABLED_WCP = 599, + FILTEREDSEARCHENABLED_WCP = 600, + XFTFONTS_WCP = 601, + USEMAGIC_WCP = 602, + MAGICPATTERN_WCP = 603, + MAGICCOMPRESSED_WCP = 604, + MAGICMIME_WCP = 605, + VOLUMEMANAGER_WCP = 606, + MOUNTCOMMAND_WCP = 607, + UNMOUNTCOMMAND_WCP = 608, + FSTABFILE_WCP = 609, + MTABFILE_WCP = 610, + PARTFILE_WCP = 611, + REQUESTACTION_WCP = 612, + SIZEH_WCP = 613, + NEXTAGING_WCP = 614, + ENTRY_WCP = 615, + PREFIX_WCP = 616, + VALUE_WCP = 617, + EJECTCOMMAND_WCP = 618, + CLOSETRAYCOMMAND_WCP = 619, + AVFSMODULE_WCP = 620, + FLEXIBLEMATCH_WCP = 621, + USE_VERSION_STRING_COMPARE_WCP = 622, + SWITCHBUTTONBANKOP_WCP = 623, + SWITCHTONEXTBANK_WCP = 624, + SWITCHTOPREVBANK_WCP = 625, + SWITCHTOBANKNR_WCP = 626, + BANKNR_WCP = 627, + USE_VIRTUAL_TEMP_COPIES_WCP = 628, + PATHJUMPOP_WCP = 629, + PATHJUMPALLOWDIRS_WCP = 630, + CLIPBOARDOP_WCP = 631, + CLIPBOARDSTRING_WCP = 632, + COMMANDSTRING_WCP = 633, + EVALCOMMAND_WCP = 634, + WATCHMODE_WCP = 635, + APPLY_WINDOW_DIALOG_TYPE_WCP = 636, + FLAGS_ARE_RELATIVE_TO_BASEDIR_WCP = 637, + COMMANDMENUOP_WCP = 638, + SEARCHMODEONKEYPRESS_WCP = 639, + PATHENTRYONTOP_WCP = 640, + STORE_FILES_ALWAYS_WCP = 641, + PATHJUMPSETS_WCP = 642, + SHOWDOTDOT_WCP = 643, + SHOWBREADCRUMB_WCP = 644, + FACES_WCP = 645, + FACE_WCP = 646, + ENABLE_INFO_LINE_WCP = 647, + INFO_LINE_LUA_MODE_WCP = 648, + INFO_LINE_CONTENT_WCP = 649, + RESTORE_TABS_MODE_WCP = 650, + STORE_TABS_MODE_WCP = 651, + AS_EXIT_STATE_WCP = 652, + USE_EXTENDED_REGEX_WCP = 653, + HIGHLIGHT_USER_ACTION_WCP = 654, + CHTIMEOP_WCP = 655, + ADJUSTRELATIVESYMLINKS_WCP = 656, + OUTSIDE_WCP = 657, + EDIT_WCP = 658, + MAKEABSOLUTE_WCP = 659, + MAKERELATIVE_WCP = 660, + MAGICIGNORECASE_WCP = 661, + ENSURE_FILE_PERMISSIONS_WCP = 662, + USER_RW_WCP = 663, + USER_RW_GROUP_R_WCP = 664, + USER_RW_ALL_R_WCP = 665, + LEAVE_UNMODIFIED_WCP = 666, + PREFERUDISKSVERSION_WCP = 667, + CHANGECOLUMNSOP_WCP = 668, + PATTERNISCOMMASEPARATED_WCP = 669, + STRCASECMP_WCP = 670, + USE_STRING_COMPARE_MODE_WCP = 671, + VIEWNEWESTFILESOP_WCP = 672, + SHOWRECENT_WCP = 673, + DIRCOMPAREOP_WCP = 674, + TABPROFILESOP_WCP = 675, + EXTERNALVDIROP_WCP = 676, + VDIR_PRESERVE_DIR_STRUCTURE_WCP = 677, + OPENTABMENUOP_WCP = 678, + STRING_WCP = 679, + NUM_WCP = 680 + }; #endif /* Tokens. */ #define LEFTBRACE_WCP 258 @@ -1069,139 +1071,130 @@ #define CLOSECURRENTTAB_WCP 583 #define NEXTTAB_WCP 584 #define PREVTAB_WCP 585 -#define CHANGELAYOUTOP_WCP 586 -#define INFIXSEARCH_WCP 587 -#define VOLUMEMANAGEROP_WCP 588 -#define ERROR 589 -#define ACTIVESIDE_WCP 590 -#define SHOWFREESPACE_WCP 591 -#define ACTIVEMODE_WCP 592 -#define ASK_WCP 593 -#define SSHALLOW_WCP 594 -#define FIELD_WIDTH_WCP 595 -#define QUICKSEARCHENABLED_WCP 596 -#define FILTEREDSEARCHENABLED_WCP 597 -#define XFTFONTS_WCP 598 -#define USEMAGIC_WCP 599 -#define MAGICPATTERN_WCP 600 -#define MAGICCOMPRESSED_WCP 601 -#define MAGICMIME_WCP 602 -#define VOLUMEMANAGER_WCP 603 -#define MOUNTCOMMAND_WCP 604 -#define UNMOUNTCOMMAND_WCP 605 -#define FSTABFILE_WCP 606 -#define MTABFILE_WCP 607 -#define PARTFILE_WCP 608 -#define REQUESTACTION_WCP 609 -#define SIZEH_WCP 610 -#define NEXTAGING_WCP 611 -#define ENTRY_WCP 612 -#define PREFIX_WCP 613 -#define VALUE_WCP 614 -#define EJECTCOMMAND_WCP 615 -#define CLOSETRAYCOMMAND_WCP 616 -#define AVFSMODULE_WCP 617 -#define FLEXIBLEMATCH_WCP 618 -#define USE_VERSION_STRING_COMPARE_WCP 619 -#define SWITCHBUTTONBANKOP_WCP 620 -#define SWITCHTONEXTBANK_WCP 621 -#define SWITCHTOPREVBANK_WCP 622 -#define SWITCHTOBANKNR_WCP 623 -#define BANKNR_WCP 624 -#define USE_VIRTUAL_TEMP_COPIES_WCP 625 -#define PATHJUMPOP_WCP 626 -#define PATHJUMPALLOWDIRS_WCP 627 -#define CLIPBOARDOP_WCP 628 -#define CLIPBOARDSTRING_WCP 629 -#define COMMANDSTRING_WCP 630 -#define EVALCOMMAND_WCP 631 -#define WATCHMODE_WCP 632 -#define APPLY_WINDOW_DIALOG_TYPE_WCP 633 -#define FLAGS_ARE_RELATIVE_TO_BASEDIR_WCP 634 -#define COMMANDMENUOP_WCP 635 -#define SEARCHMODEONKEYPRESS_WCP 636 -#define PATHENTRYONTOP_WCP 637 -#define STORE_FILES_ALWAYS_WCP 638 -#define PATHJUMPSETS_WCP 639 -#define SHOWDOTDOT_WCP 640 -#define SHOWBREADCRUMB_WCP 641 -#define FACES_WCP 642 -#define FACE_WCP 643 -#define ENABLE_INFO_LINE_WCP 644 -#define INFO_LINE_LUA_MODE_WCP 645 -#define INFO_LINE_CONTENT_WCP 646 -#define RESTORE_TABS_MODE_WCP 647 -#define STORE_TABS_MODE_WCP 648 -#define AS_EXIT_STATE_WCP 649 -#define USE_EXTENDED_REGEX_WCP 650 -#define HIGHLIGHT_USER_ACTION_WCP 651 -#define CHTIMEOP_WCP 652 -#define ADJUSTRELATIVESYMLINKS_WCP 653 -#define OUTSIDE_WCP 654 -#define EDIT_WCP 655 -#define MAKEABSOLUTE_WCP 656 -#define MAKERELATIVE_WCP 657 -#define MAGICIGNORECASE_WCP 658 -#define ENSURE_FILE_PERMISSIONS_WCP 659 -#define USER_RW_WCP 660 -#define USER_RW_GROUP_R_WCP 661 -#define USER_RW_ALL_R_WCP 662 -#define LEAVE_UNMODIFIED_WCP 663 -#define PREFERUDISKSVERSION_WCP 664 -#define CHANGECOLUMNSOP_WCP 665 -#define PATTERNISCOMMASEPARATED_WCP 666 -#define STRCASECMP_WCP 667 -#define USE_STRING_COMPARE_MODE_WCP 668 -#define VIEWNEWESTFILESOP_WCP 669 -#define SHOWRECENT_WCP 670 -#define DIRCOMPAREOP_WCP 671 -#define TABPROFILESOP_WCP 672 -#define EXTERNALVDIROP_WCP 673 -#define STRING_WCP 674 -#define NUM_WCP 675 - - +#define TOGGLELOCKSTATE_WCP 586 +#define MOVETABLEFT_WCP 587 +#define MOVETABRIGHT_WCP 588 +#define CHANGELAYOUTOP_WCP 589 +#define INFIXSEARCH_WCP 590 +#define VOLUMEMANAGEROP_WCP 591 +#define ERROR 592 +#define ACTIVESIDE_WCP 593 +#define SHOWFREESPACE_WCP 594 +#define ACTIVEMODE_WCP 595 +#define ASK_WCP 596 +#define SSHALLOW_WCP 597 +#define FIELD_WIDTH_WCP 598 +#define QUICKSEARCHENABLED_WCP 599 +#define FILTEREDSEARCHENABLED_WCP 600 +#define XFTFONTS_WCP 601 +#define USEMAGIC_WCP 602 +#define MAGICPATTERN_WCP 603 +#define MAGICCOMPRESSED_WCP 604 +#define MAGICMIME_WCP 605 +#define VOLUMEMANAGER_WCP 606 +#define MOUNTCOMMAND_WCP 607 +#define UNMOUNTCOMMAND_WCP 608 +#define FSTABFILE_WCP 609 +#define MTABFILE_WCP 610 +#define PARTFILE_WCP 611 +#define REQUESTACTION_WCP 612 +#define SIZEH_WCP 613 +#define NEXTAGING_WCP 614 +#define ENTRY_WCP 615 +#define PREFIX_WCP 616 +#define VALUE_WCP 617 +#define EJECTCOMMAND_WCP 618 +#define CLOSETRAYCOMMAND_WCP 619 +#define AVFSMODULE_WCP 620 +#define FLEXIBLEMATCH_WCP 621 +#define USE_VERSION_STRING_COMPARE_WCP 622 +#define SWITCHBUTTONBANKOP_WCP 623 +#define SWITCHTONEXTBANK_WCP 624 +#define SWITCHTOPREVBANK_WCP 625 +#define SWITCHTOBANKNR_WCP 626 +#define BANKNR_WCP 627 +#define USE_VIRTUAL_TEMP_COPIES_WCP 628 +#define PATHJUMPOP_WCP 629 +#define PATHJUMPALLOWDIRS_WCP 630 +#define CLIPBOARDOP_WCP 631 +#define CLIPBOARDSTRING_WCP 632 +#define COMMANDSTRING_WCP 633 +#define EVALCOMMAND_WCP 634 +#define WATCHMODE_WCP 635 +#define APPLY_WINDOW_DIALOG_TYPE_WCP 636 +#define FLAGS_ARE_RELATIVE_TO_BASEDIR_WCP 637 +#define COMMANDMENUOP_WCP 638 +#define SEARCHMODEONKEYPRESS_WCP 639 +#define PATHENTRYONTOP_WCP 640 +#define STORE_FILES_ALWAYS_WCP 641 +#define PATHJUMPSETS_WCP 642 +#define SHOWDOTDOT_WCP 643 +#define SHOWBREADCRUMB_WCP 644 +#define FACES_WCP 645 +#define FACE_WCP 646 +#define ENABLE_INFO_LINE_WCP 647 +#define INFO_LINE_LUA_MODE_WCP 648 +#define INFO_LINE_CONTENT_WCP 649 +#define RESTORE_TABS_MODE_WCP 650 +#define STORE_TABS_MODE_WCP 651 +#define AS_EXIT_STATE_WCP 652 +#define USE_EXTENDED_REGEX_WCP 653 +#define HIGHLIGHT_USER_ACTION_WCP 654 +#define CHTIMEOP_WCP 655 +#define ADJUSTRELATIVESYMLINKS_WCP 656 +#define OUTSIDE_WCP 657 +#define EDIT_WCP 658 +#define MAKEABSOLUTE_WCP 659 +#define MAKERELATIVE_WCP 660 +#define MAGICIGNORECASE_WCP 661 +#define ENSURE_FILE_PERMISSIONS_WCP 662 +#define USER_RW_WCP 663 +#define USER_RW_GROUP_R_WCP 664 +#define USER_RW_ALL_R_WCP 665 +#define LEAVE_UNMODIFIED_WCP 666 +#define PREFERUDISKSVERSION_WCP 667 +#define CHANGECOLUMNSOP_WCP 668 +#define PATTERNISCOMMASEPARATED_WCP 669 +#define STRCASECMP_WCP 670 +#define USE_STRING_COMPARE_MODE_WCP 671 +#define VIEWNEWESTFILESOP_WCP 672 +#define SHOWRECENT_WCP 673 +#define DIRCOMPAREOP_WCP 674 +#define TABPROFILESOP_WCP 675 +#define EXTERNALVDIROP_WCP 676 +#define VDIR_PRESERVE_DIR_STRUCTURE_WCP 677 +#define OPENTABMENUOP_WCP 678 +#define STRING_WCP 679 +#define NUM_WCP 680 +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE + +union YYSTYPE { -/* Line 387 of yacc.c */ -#line 221 "configparser.yy" +#line 221 "configparser.yy" /* yacc.c:355 */ int num; char *strptr; +#line 1181 "configparser.cc" /* yacc.c:355 */ +}; -/* Line 387 of yacc.c */ -#line 1177 "configparser.cc" -} YYSTYPE; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_CONFIGPARSER_HH_INCLUDED */ /* Copy the second part of user declarations. */ -/* Line 390 of yacc.c */ -#line 1205 "configparser.cc" +#line 1198 "configparser.cc" /* yacc.c:358 */ #ifdef short # undef short @@ -1215,11 +1208,8 @@ #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -1239,8 +1229,7 @@ # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -1262,6 +1251,33 @@ # endif #endif +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +# endif +#endif + /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -1269,24 +1285,26 @@ # define YYUSE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(N) (N) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif + #if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -1304,8 +1322,7 @@ # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include /* INFRINGES ON USER NAME SPACE */ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS @@ -1317,8 +1334,8 @@ # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -1334,7 +1351,7 @@ # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -1342,15 +1359,13 @@ # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -1360,7 +1375,7 @@ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -1385,16 +1400,16 @@ elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif @@ -1413,7 +1428,7 @@ for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -1421,34 +1436,36 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2333 +#define YYLAST 2356 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 425 +#define YYNTOKENS 430 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 669 +#define YYNNTS 675 /* YYNRULES -- Number of rules. */ -#define YYNRULES 1170 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 2786 +#define YYNRULES 1181 +/* YYNSTATES -- Number of states. */ +#define YYNSTATES 2809 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 675 +#define YYMAXUTOK 680 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint16 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 424, 2, 421, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 422, - 2, 423, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 429, 2, 426, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 427, + 2, 428, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1509,675 +1526,133 @@ 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - 415, 416, 417, 418, 419, 420 + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, + 425 }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint16 yyprhs[] = -{ - 0, 0, 3, 4, 5, 16, 22, 23, 24, 32, - 38, 39, 40, 48, 49, 50, 58, 59, 60, 68, - 69, 70, 78, 84, 90, 96, 102, 103, 104, 112, - 113, 114, 119, 120, 121, 128, 129, 130, 137, 138, - 145, 146, 153, 154, 161, 167, 168, 175, 176, 183, - 184, 191, 192, 199, 205, 206, 213, 214, 221, 227, - 228, 235, 236, 243, 244, 251, 252, 259, 260, 267, - 273, 274, 275, 280, 281, 286, 287, 292, 293, 298, - 299, 304, 305, 310, 311, 316, 317, 322, 323, 328, - 329, 336, 337, 344, 345, 352, 353, 360, 361, 362, - 373, 374, 375, 382, 383, 390, 391, 392, 399, 400, - 407, 408, 415, 416, 423, 424, 431, 432, 439, 440, - 447, 448, 449, 454, 455, 460, 461, 466, 467, 472, - 473, 478, 479, 484, 485, 490, 491, 496, 497, 502, - 503, 508, 509, 514, 515, 520, 521, 526, 527, 528, - 535, 536, 543, 544, 551, 552, 559, 560, 567, 568, - 575, 576, 583, 584, 591, 592, 599, 600, 607, 608, - 615, 616, 617, 624, 625, 632, 633, 640, 641, 648, - 649, 656, 657, 664, 665, 666, 674, 675, 676, 684, - 685, 686, 694, 695, 696, 705, 706, 715, 716, 725, - 726, 735, 736, 745, 746, 755, 756, 765, 766, 775, - 776, 785, 786, 795, 796, 805, 806, 815, 816, 825, - 826, 835, 836, 843, 844, 853, 854, 863, 864, 873, - 874, 875, 883, 889, 890, 891, 892, 900, 901, 902, - 911, 912, 921, 922, 929, 930, 931, 932, 940, 941, - 942, 949, 950, 957, 958, 959, 966, 967, 974, 975, - 982, 983, 990, 991, 998, 999, 1006, 1007, 1014, 1015, - 1022, 1023, 1030, 1031, 1032, 1033, 1041, 1042, 1043, 1050, - 1051, 1058, 1059, 1068, 1069, 1076, 1077, 1078, 1086, 1087, - 1088, 1089, 1090, 1091, 1105, 1106, 1107, 1108, 1109, 1110, - 1111, 1132, 1133, 1134, 1141, 1142, 1149, 1150, 1157, 1158, - 1165, 1166, 1173, 1174, 1181, 1182, 1189, 1190, 1197, 1198, - 1199, 1200, 1208, 1209, 1210, 1218, 1219, 1226, 1227, 1228, - 1233, 1234, 1235, 1236, 1244, 1245, 1246, 1253, 1254, 1261, - 1262, 1269, 1270, 1277, 1278, 1285, 1286, 1293, 1294, 1301, - 1302, 1309, 1310, 1317, 1323, 1324, 1331, 1332, 1339, 1345, - 1346, 1355, 1356, 1365, 1366, 1375, 1376, 1385, 1386, 1393, - 1394, 1401, 1402, 1409, 1410, 1417, 1418, 1425, 1426, 1433, - 1434, 1441, 1442, 1449, 1450, 1457, 1458, 1465, 1466, 1473, - 1474, 1475, 1482, 1483, 1485, 1487, 1489, 1491, 1493, 1494, - 1495, 1503, 1504, 1505, 1513, 1514, 1515, 1523, 1524, 1525, - 1533, 1534, 1535, 1544, 1545, 1546, 1561, 1562, 1565, 1571, - 1572, 1573, 1574, 1575, 1583, 1584, 1585, 1592, 1593, 1594, - 1602, 1603, 1604, 1612, 1613, 1614, 1615, 1623, 1624, 1625, - 1632, 1633, 1640, 1641, 1650, 1651, 1652, 1660, 1661, 1662, - 1670, 1671, 1672, 1679, 1680, 1687, 1688, 1695, 1696, 1703, - 1704, 1711, 1712, 1719, 1720, 1721, 1728, 1729, 1736, 1737, - 1744, 1745, 1752, 1753, 1760, 1761, 1768, 1769, 1770, 1777, - 1778, 1785, 1786, 1793, 1794, 1801, 1802, 1809, 1810, 1817, - 1818, 1825, 1826, 1833, 1834, 1841, 1842, 1843, 1850, 1851, - 1858, 1859, 1866, 1867, 1874, 1875, 1882, 1883, 1890, 1891, - 1898, 1899, 1901, 1903, 1905, 1907, 1909, 1911, 1913, 1915, - 1917, 1919, 1921, 1923, 1925, 1927, 1929, 1931, 1933, 1935, - 1937, 1939, 1941, 1943, 1945, 1947, 1949, 1951, 1953, 1955, - 1957, 1959, 1961, 1963, 1965, 1967, 1969, 1971, 1973, 1975, - 1977, 1979, 1981, 1983, 1985, 1987, 1989, 1991, 1993, 1995, - 1997, 1999, 2001, 2003, 2005, 2007, 2009, 2011, 2013, 2015, - 2017, 2019, 2021, 2023, 2025, 2027, 2029, 2031, 2033, 2035, - 2037, 2039, 2041, 2042, 2048, 2049, 2056, 2057, 2064, 2065, - 2072, 2073, 2080, 2081, 2088, 2089, 2096, 2097, 2104, 2105, - 2112, 2113, 2120, 2121, 2128, 2129, 2136, 2137, 2144, 2145, - 2152, 2153, 2160, 2161, 2162, 2167, 2168, 2173, 2174, 2179, - 2180, 2185, 2186, 2192, 2193, 2200, 2201, 2202, 2207, 2208, - 2213, 2214, 2220, 2221, 2228, 2229, 2236, 2237, 2244, 2245, - 2246, 2252, 2253, 2260, 2261, 2268, 2269, 2276, 2277, 2284, - 2285, 2292, 2293, 2300, 2301, 2308, 2309, 2316, 2317, 2324, - 2325, 2332, 2333, 2340, 2341, 2348, 2349, 2356, 2357, 2364, - 2365, 2372, 2373, 2380, 2381, 2388, 2389, 2396, 2397, 2404, - 2405, 2406, 2411, 2412, 2417, 2418, 2423, 2424, 2429, 2430, - 2435, 2436, 2441, 2442, 2447, 2448, 2453, 2454, 2459, 2460, - 2466, 2467, 2474, 2475, 2482, 2483, 2490, 2491, 2498, 2499, - 2506, 2507, 2508, 2514, 2515, 2522, 2523, 2530, 2531, 2538, - 2539, 2546, 2547, 2548, 2553, 2554, 2560, 2561, 2568, 2569, - 2570, 2576, 2577, 2584, 2585, 2586, 2591, 2592, 2598, 2599, - 2606, 2607, 2614, 2615, 2616, 2622, 2623, 2630, 2631, 2632, - 2638, 2639, 2646, 2647, 2654, 2655, 2662, 2663, 2670, 2671, - 2678, 2679, 2686, 2687, 2688, 2693, 2694, 2699, 2700, 2705, - 2706, 2711, 2712, 2718, 2719, 2726, 2727, 2734, 2735, 2742, - 2743, 2750, 2751, 2758, 2759, 2766, 2767, 2774, 2775, 2782, - 2783, 2790, 2791, 2798, 2799, 2800, 2806, 2807, 2814, 2815, - 2822, 2823, 2830, 2831, 2838, 2839, 2840, 2846, 2847, 2854, - 2855, 2862, 2863, 2870, 2871, 2878, 2879, 2880, 2886, 2887, - 2894, 2895, 2902, 2903, 2904, 2910, 2911, 2918, 2919, 2926, - 2927, 2934, 2935, 2936, 2942, 2943, 2950, 2951, 2958, 2959, - 2966, 2967, 2968, 2974, 2975, 2982, 2983, 2990, 2991, 2998, - 2999, 3006, 3007, 3008, 3014, 3015, 3022, 3023, 3030, 3031, - 3038, 3039, 3046, 3047, 3048, 3054, 3055, 3062, 3063, 3064, - 3070, 3071, 3078, 3079, 3086, 3087, 3094, 3095, 3102, 3103, - 3110, 3111, 3118, 3119, 3126, 3127, 3134, 3135, 3142, 3143, - 3150, 3151, 3158, 3159, 3166, 3167, 3174, 3175, 3176, 3182, - 3183, 3190, 3191, 3198, 3199, 3206, 3207, 3214, 3215, 3222, - 3223, 3230, 3231, 3238, 3239, 3246, 3247, 3254, 3255, 3262, - 3263, 3270, 3271, 3278, 3279, 3286, 3287, 3294, 3295, 3302, - 3303, 3304, 3309, 3310, 3316, 3317, 3324, 3325, 3332, 3333, - 3340, 3341, 3348, 3349, 3350, 3356, 3357, 3364, 3365, 3372, - 3373, 3380, 3381, 3388, 3389, 3396, 3397, 3404, 3405, 3412, - 3413, 3420, 3421, 3428, 3429, 3436, 3437, 3444, 3445, 3452, - 3453, 3460, 3461, 3468, 3469, 3476, 3477, 3484, 3485, 3492, - 3493, 3500, 3501, 3508, 3509, 3516, 3517, 3524, 3525, 3532, - 3533, 3540, 3541, 3548, 3549, 3556, 3557, 3564, 3565, 3572, - 3573, 3580, 3581, 3588, 3589, 3590, 3595, 3596, 3601, 3602, - 3607, 3608, 3614, 3615, 3622, 3623, 3630, 3631, 3638, 3639, - 3646, 3647, 3654, 3655, 3662, 3663, 3670, 3671, 3672, 3678, - 3679, 3686, 3687, 3694, 3695, 3702, 3703, 3710, 3711, 3712, - 3718, 3719, 3726, 3727, 3728, 3734, 3735, 3742, 3743, 3750, - 3751, 3752, 3757, 3758, 3764, 3765, 3772, 3773, 3774, 3780, - 3781, 3788, 3789, 3790, 3795, 3796, 3802, 3803, 3810, 3811, - 3818, 3819, 3820, 3826, 3827, 3834, 3835, 3842, 3843, 3850, - 3851, 3858, 3859, 3860, 3866, 3867, 3872, 3873, 3878, 3879, - 3884, 3885, 3890, 3891, 3896, 3897, 3902, 3903, 3908, 3909, - 3914, 3915, 3920, 3921, 3928, 3929, 3936, 3937, 3944, 3945, - 3952, 3953, 3954, 3960, 3961, 3966, 3967, 3972, 3973, 3978, - 3979, 3984, 3985, 3990, 3991, 3996, 3997, 4002, 4003, 4008, - 4009, 4014, 4015, 4020, 4021, 4026, 4027, 4032, 4033, 4038, - 4039, 4040, 4045, 4046, 4052, 4053, 4060, 4061, 4068, 4069, - 4076, 4077, 4084, 4085, 4086, 4091, 4092, 4098, 4099, 4106, - 4107, 4108, 4113, 4114, 4119, 4120, 4125, 4126, 4132, 4133, - 4140 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int16 yyrhs[] = -{ - 426, 0, -1, -1, -1, 427, 156, 420, 421, 420, - 421, 420, 422, 428, 429, -1, 5, 3, 446, 4, - 429, -1, -1, -1, 6, 3, 430, 528, 431, 4, - 429, -1, 57, 3, 562, 4, 429, -1, -1, -1, - 64, 3, 432, 572, 4, 433, 429, -1, -1, -1, - 66, 3, 434, 602, 4, 435, 429, -1, -1, -1, - 85, 3, 436, 658, 4, 437, 429, -1, -1, -1, - 59, 3, 438, 667, 4, 439, 429, -1, 87, 3, - 678, 4, 429, -1, 343, 3, 685, 4, 429, -1, - 94, 3, 702, 4, 429, -1, 384, 3, 444, 4, - 429, -1, -1, -1, 372, 3, 440, 442, 4, 441, - 429, -1, -1, -1, 419, 422, 443, 442, -1, -1, - -1, 383, 423, 710, 422, 445, 444, -1, -1, -1, - 7, 423, 419, 422, 447, 446, -1, -1, 29, 423, - 420, 422, 448, 446, -1, -1, 30, 423, 420, 422, - 449, 446, -1, -1, 31, 423, 420, 422, 450, 446, - -1, 10, 3, 478, 4, 446, -1, -1, 32, 423, - 36, 422, 451, 446, -1, -1, 32, 423, 37, 422, - 452, 446, -1, -1, 33, 423, 419, 422, 453, 446, - -1, -1, 34, 423, 710, 422, 454, 446, -1, 35, - 3, 503, 4, 446, -1, -1, 8, 3, 455, 476, - 4, 446, -1, -1, 255, 3, 456, 462, 4, 446, - -1, 287, 3, 515, 4, 446, -1, -1, 309, 423, - 710, 422, 457, 446, -1, -1, 364, 423, 710, 422, - 458, 446, -1, -1, 413, 423, 412, 422, 459, 446, - -1, -1, 378, 423, 710, 422, 460, 446, -1, -1, - 395, 423, 710, 422, 461, 446, -1, 348, 3, 692, - 4, 446, -1, -1, -1, 43, 422, 463, 462, -1, - -1, 46, 422, 464, 462, -1, -1, 59, 422, 465, - 462, -1, -1, 249, 422, 466, 462, -1, -1, 250, - 422, 467, 462, -1, -1, 251, 422, 468, 462, -1, - -1, 252, 422, 469, 462, -1, -1, 253, 422, 470, - 462, -1, -1, 254, 422, 471, 462, -1, -1, 256, - 423, 710, 422, 472, 462, -1, -1, 257, 423, 710, - 422, 473, 462, -1, -1, 258, 423, 420, 422, 474, - 462, -1, -1, 259, 423, 710, 422, 475, 462, -1, - -1, -1, 420, 423, 420, 424, 420, 424, 420, 422, - 477, 476, -1, -1, -1, 13, 479, 3, 481, 4, - 478, -1, -1, 14, 480, 3, 481, 4, 478, -1, - -1, -1, 15, 423, 710, 422, 482, 481, -1, -1, - 16, 423, 420, 422, 483, 481, -1, -1, 17, 423, - 710, 422, 484, 481, -1, -1, 18, 423, 420, 422, - 485, 481, -1, -1, 19, 3, 486, 489, 4, 481, - -1, -1, 246, 423, 710, 422, 487, 481, -1, -1, - 382, 423, 710, 422, 488, 481, -1, -1, -1, 20, - 422, 490, 489, -1, -1, 21, 422, 491, 489, -1, - -1, 22, 422, 492, 489, -1, -1, 23, 422, 493, - 489, -1, -1, 24, 422, 494, 489, -1, -1, 25, - 422, 495, 489, -1, -1, 26, 422, 496, 489, -1, - -1, 27, 422, 497, 489, -1, -1, 28, 422, 498, - 489, -1, -1, 243, 422, 499, 489, -1, -1, 244, - 422, 500, 489, -1, -1, 245, 422, 501, 489, -1, - -1, 355, 422, 502, 489, -1, -1, -1, 39, 423, - 36, 422, 504, 503, -1, -1, 39, 423, 37, 422, - 505, 503, -1, -1, 39, 423, 38, 422, 506, 503, - -1, -1, 39, 423, 157, 422, 507, 503, -1, -1, - 158, 423, 419, 422, 508, 503, -1, -1, 41, 423, - 710, 422, 509, 503, -1, -1, 40, 423, 36, 422, - 510, 503, -1, -1, 40, 423, 37, 422, 511, 503, - -1, -1, 40, 423, 157, 422, 512, 503, -1, -1, - 159, 423, 419, 422, 513, 503, -1, -1, 42, 423, - 710, 422, 514, 503, -1, -1, -1, 288, 423, 420, - 422, 516, 515, -1, -1, 289, 423, 420, 422, 517, - 515, -1, -1, 290, 423, 420, 422, 518, 515, -1, - -1, 291, 423, 68, 422, 519, 515, -1, -1, 291, - 423, 292, 422, 520, 515, -1, -1, 303, 423, 420, - 422, 521, 515, -1, -1, -1, 304, 3, 522, 593, - 4, 523, 515, -1, -1, -1, 305, 3, 524, 593, - 4, 525, 515, -1, -1, -1, 306, 3, 526, 593, - 4, 527, 515, -1, -1, -1, 43, 423, 420, 424, - 420, 422, 529, 528, -1, -1, 44, 423, 420, 424, - 420, 422, 530, 528, -1, -1, 45, 423, 420, 424, - 420, 422, 531, 528, -1, -1, 49, 423, 420, 424, - 420, 422, 532, 528, -1, -1, 48, 423, 420, 424, - 420, 422, 533, 528, -1, -1, 51, 423, 420, 424, - 420, 422, 534, 528, -1, -1, 50, 423, 420, 424, - 420, 422, 535, 528, -1, -1, 46, 423, 420, 424, - 420, 422, 536, 528, -1, -1, 47, 423, 420, 424, - 420, 422, 537, 528, -1, -1, 53, 423, 420, 424, - 420, 422, 538, 528, -1, -1, 52, 423, 420, 424, - 420, 422, 539, 528, -1, -1, 55, 423, 420, 424, - 420, 422, 540, 528, -1, -1, 54, 423, 420, 424, - 420, 422, 541, 528, -1, -1, 247, 423, 420, 424, - 420, 422, 542, 528, -1, -1, 56, 423, 420, 422, - 543, 528, -1, -1, 296, 423, 420, 424, 420, 422, - 544, 528, -1, -1, 297, 423, 420, 424, 420, 422, - 545, 528, -1, -1, 298, 423, 420, 424, 420, 422, - 546, 528, -1, -1, -1, 313, 3, 547, 549, 4, - 548, 528, -1, 387, 3, 556, 4, 528, -1, -1, - -1, -1, 160, 3, 550, 552, 4, 551, 549, -1, - -1, -1, 68, 423, 420, 424, 420, 422, 553, 552, - -1, -1, 191, 423, 420, 424, 420, 422, 554, 552, - -1, -1, 20, 423, 419, 422, 555, 552, -1, -1, - -1, -1, 388, 3, 557, 559, 4, 558, 556, -1, - -1, -1, 160, 423, 420, 422, 560, 559, -1, -1, - 20, 423, 419, 422, 561, 559, -1, -1, -1, 13, - 423, 419, 422, 563, 562, -1, -1, 14, 423, 419, - 422, 564, 562, -1, -1, 392, 423, 186, 422, 565, - 562, -1, -1, 392, 423, 185, 422, 566, 562, -1, - -1, 392, 423, 338, 422, 567, 562, -1, -1, 393, - 423, 186, 422, 568, 562, -1, -1, 393, 423, 185, - 422, 569, 562, -1, -1, 393, 423, 394, 422, 570, - 562, -1, -1, 393, 423, 338, 422, 571, 562, -1, - -1, -1, -1, 65, 3, 573, 575, 4, 574, 572, - -1, -1, -1, 60, 423, 420, 422, 576, 575, -1, - -1, 61, 423, 419, 422, 577, 575, -1, -1, 160, - 423, 420, 424, 420, 422, 578, 575, -1, -1, 65, - 423, 419, 422, 579, 575, -1, -1, -1, 63, 3, - 580, 582, 4, 581, 575, -1, -1, -1, -1, -1, - -1, 68, 3, 583, 102, 423, 419, 422, 584, 593, - 585, 4, 586, 582, -1, -1, -1, -1, -1, -1, - -1, 103, 3, 587, 102, 423, 419, 422, 588, 593, - 589, 102, 423, 419, 422, 590, 593, 591, 4, 592, - 582, -1, -1, -1, 104, 423, 105, 422, 594, 593, - -1, -1, 104, 423, 106, 422, 595, 593, -1, -1, - 104, 423, 107, 422, 596, 593, -1, -1, 104, 423, - 108, 422, 597, 593, -1, -1, 104, 423, 109, 422, - 598, 593, -1, -1, 104, 423, 110, 422, 599, 593, - -1, -1, 104, 423, 111, 422, 600, 593, -1, -1, - 104, 423, 112, 422, 601, 593, -1, -1, -1, -1, - 67, 3, 603, 613, 4, 604, 602, -1, -1, -1, - 84, 3, 605, 608, 4, 606, 602, -1, -1, 275, - 423, 710, 422, 607, 602, -1, -1, -1, 419, 422, - 609, 608, -1, -1, -1, -1, 67, 3, 611, 613, - 4, 612, 610, -1, -1, -1, 22, 423, 642, 422, - 614, 613, -1, -1, 61, 423, 419, 422, 615, 613, - -1, -1, 75, 423, 419, 422, 616, 613, -1, -1, - 73, 423, 710, 422, 617, 613, -1, -1, 76, 3, - 618, 640, 4, 613, -1, -1, 74, 423, 710, 422, - 619, 613, -1, -1, 161, 423, 710, 422, 620, 613, - -1, -1, 162, 423, 710, 422, 621, 613, -1, -1, - 163, 423, 710, 422, 622, 613, -1, 77, 3, 643, - 4, 613, -1, -1, 260, 423, 419, 422, 623, 613, - -1, -1, 261, 423, 710, 422, 624, 613, -1, 262, - 3, 610, 4, 613, -1, -1, 268, 423, 420, 424, - 420, 422, 625, 613, -1, -1, 269, 423, 420, 424, - 420, 422, 626, 613, -1, -1, 270, 423, 420, 424, - 420, 422, 627, 613, -1, -1, 271, 423, 420, 424, - 420, 422, 628, 613, -1, -1, 272, 423, 419, 422, - 629, 613, -1, -1, 265, 423, 266, 422, 630, 613, - -1, -1, 265, 423, 267, 422, 631, 613, -1, -1, - 265, 423, 98, 422, 632, 613, -1, -1, 265, 423, - 273, 422, 633, 613, -1, -1, 345, 423, 419, 422, - 634, 613, -1, -1, 344, 423, 710, 422, 635, 613, - -1, -1, 346, 423, 710, 422, 636, 613, -1, -1, - 347, 423, 710, 422, 637, 613, -1, -1, 403, 423, - 710, 422, 638, 613, -1, -1, 411, 423, 710, 422, - 639, 613, -1, -1, -1, 420, 423, 420, 422, 641, - 640, -1, -1, 68, -1, 69, -1, 70, -1, 71, - -1, 72, -1, -1, -1, 78, 3, 644, 656, 4, - 645, 643, -1, -1, -1, 79, 3, 646, 656, 4, - 647, 643, -1, -1, -1, 80, 3, 648, 656, 4, - 649, 643, -1, -1, -1, 81, 3, 650, 656, 4, - 651, 643, -1, -1, -1, 82, 420, 3, 652, 656, - 4, 653, 643, -1, -1, -1, 308, 3, 654, 20, - 423, 419, 422, 62, 3, 656, 4, 4, 655, 643, - -1, -1, 711, 656, -1, 83, 3, 657, 4, 656, - -1, -1, -1, -1, -1, 86, 3, 659, 661, 4, - 660, 658, -1, -1, -1, 61, 423, 419, 422, 662, - 661, -1, -1, -1, 62, 3, 663, 656, 4, 664, - 661, -1, -1, -1, 63, 3, 665, 582, 4, 666, - 661, -1, -1, -1, -1, 58, 3, 668, 670, 4, - 669, 667, -1, -1, -1, 60, 423, 420, 422, 671, - 670, -1, -1, 61, 423, 419, 422, 672, 670, -1, - -1, 160, 423, 420, 424, 420, 422, 673, 670, -1, - -1, -1, 62, 3, 674, 656, 4, 675, 670, -1, - -1, -1, 63, 3, 676, 582, 4, 677, 670, -1, - -1, -1, 88, 423, 419, 422, 679, 678, -1, -1, - 89, 423, 419, 422, 680, 678, -1, -1, 90, 423, - 419, 422, 681, 678, -1, -1, 91, 423, 419, 422, - 682, 678, -1, -1, 92, 423, 419, 422, 683, 678, - -1, -1, 93, 423, 419, 422, 684, 678, -1, -1, - -1, 88, 423, 419, 422, 686, 685, -1, -1, 89, - 423, 419, 422, 687, 685, -1, -1, 90, 423, 419, - 422, 688, 685, -1, -1, 91, 423, 419, 422, 689, - 685, -1, -1, 92, 423, 419, 422, 690, 685, -1, - -1, 93, 423, 419, 422, 691, 685, -1, -1, -1, - 349, 423, 419, 422, 693, 692, -1, -1, 350, 423, - 419, 422, 694, 692, -1, -1, 360, 423, 419, 422, - 695, 692, -1, -1, 361, 423, 419, 422, 696, 692, - -1, -1, 351, 423, 419, 422, 697, 692, -1, -1, - 352, 423, 419, 422, 698, 692, -1, -1, 353, 423, - 419, 422, 699, 692, -1, -1, 354, 423, 710, 422, - 700, 692, -1, -1, 409, 423, 420, 422, 701, 692, - -1, -1, -1, 95, 423, 96, 422, 703, 702, -1, - -1, 95, 423, 40, 422, 704, 702, -1, -1, 95, - 423, 97, 422, 705, 702, -1, -1, 95, 423, 98, - 422, 706, 702, -1, -1, 99, 423, 420, 422, 707, - 702, -1, -1, 100, 423, 419, 422, 708, 702, -1, - -1, 101, 423, 710, 422, 709, 702, -1, -1, 11, - -1, 12, -1, 712, -1, 729, -1, 731, -1, 733, - -1, 735, -1, 737, -1, 741, -1, 743, -1, 745, - -1, 751, -1, 773, -1, 775, -1, 777, -1, 779, - -1, 781, -1, 783, -1, 785, -1, 787, -1, 789, - -1, 791, -1, 799, -1, 806, -1, 808, -1, 812, - -1, 816, -1, 818, -1, 823, -1, 827, -1, 836, - -1, 838, -1, 840, -1, 842, -1, 844, -1, 857, - -1, 864, -1, 871, -1, 876, -1, 882, -1, 888, - -1, 902, -1, 906, -1, 922, -1, 940, -1, 942, - -1, 949, -1, 981, -1, 983, -1, 985, -1, 987, - -1, 997, -1, 1008, -1, 1013, -1, 1015, -1, 1019, - -1, 1023, -1, 1025, -1, 1030, -1, 1037, -1, 1069, - -1, 1071, -1, 1078, -1, 1004, -1, 1080, -1, 895, - -1, 1053, -1, 1084, -1, 1086, -1, 1088, -1, 1090, - -1, -1, 9, 3, 713, 714, 4, -1, -1, 164, - 423, 419, 422, 715, 714, -1, -1, 165, 423, 710, - 422, 716, 714, -1, -1, 166, 423, 710, 422, 717, - 714, -1, -1, 167, 423, 33, 422, 718, 714, -1, - -1, 167, 423, 168, 422, 719, 714, -1, -1, 167, - 423, 169, 422, 720, 714, -1, -1, 167, 423, 171, - 422, 721, 714, -1, -1, 167, 423, 68, 422, 722, - 714, -1, -1, 170, 423, 419, 422, 723, 714, -1, - -1, 172, 423, 710, 422, 724, 714, -1, -1, 173, - 423, 710, 422, 725, 714, -1, -1, 274, 423, 710, - 422, 726, 714, -1, -1, 370, 423, 710, 422, 727, - 714, -1, -1, 379, 423, 710, 422, 728, 714, -1, - -1, -1, 113, 3, 730, 4, -1, -1, 114, 3, - 732, 4, -1, -1, 115, 3, 734, 4, -1, -1, - 116, 3, 736, 4, -1, -1, 117, 3, 738, 739, - 4, -1, -1, 174, 423, 420, 422, 740, 739, -1, - -1, -1, 118, 3, 742, 4, -1, -1, 119, 3, - 744, 4, -1, -1, 120, 3, 746, 747, 4, -1, - -1, 175, 423, 80, 422, 748, 747, -1, -1, 175, - 423, 176, 422, 749, 747, -1, -1, 175, 423, 177, - 422, 750, 747, -1, -1, -1, 121, 3, 752, 753, - 4, -1, -1, 178, 423, 710, 422, 754, 753, -1, - -1, 179, 423, 710, 422, 755, 753, -1, -1, 180, - 423, 710, 422, 756, 753, -1, -1, 181, 423, 710, - 422, 757, 753, -1, -1, 182, 423, 710, 422, 758, - 753, -1, -1, 183, 423, 710, 422, 759, 753, -1, - -1, 184, 423, 185, 422, 760, 753, -1, -1, 184, - 423, 186, 422, 761, 753, -1, -1, 184, 423, 68, - 422, 762, 753, -1, -1, 187, 423, 68, 422, 763, - 753, -1, -1, 187, 423, 188, 422, 764, 753, -1, - -1, 189, 423, 710, 422, 765, 753, -1, -1, 398, - 423, 186, 422, 766, 753, -1, -1, 398, 423, 399, - 422, 767, 753, -1, -1, 398, 423, 185, 422, 768, - 753, -1, -1, 404, 423, 408, 422, 769, 753, -1, - -1, 404, 423, 405, 422, 770, 753, -1, -1, 404, - 423, 406, 422, 771, 753, -1, -1, 404, 423, 407, - 422, 772, 753, -1, -1, -1, 122, 3, 774, 4, - -1, -1, 123, 3, 776, 4, -1, -1, 124, 3, - 778, 4, -1, -1, 125, 3, 780, 4, -1, -1, - 126, 3, 782, 4, -1, -1, 127, 3, 784, 4, - -1, -1, 128, 3, 786, 4, -1, -1, 129, 3, - 788, 4, -1, -1, 130, 3, 790, 4, -1, -1, - 131, 3, 792, 793, 4, -1, -1, 72, 423, 419, - 422, 794, 793, -1, -1, 190, 423, 191, 422, 795, - 793, -1, -1, 190, 423, 192, 422, 796, 793, -1, - -1, 190, 423, 193, 422, 797, 793, -1, -1, 190, - 423, 194, 422, 798, 793, -1, -1, -1, 132, 3, - 800, 801, 4, -1, -1, 190, 423, 13, 422, 802, - 801, -1, -1, 190, 423, 14, 422, 803, 801, -1, - -1, 190, 423, 195, 422, 804, 801, -1, -1, 190, - 423, 196, 422, 805, 801, -1, -1, -1, 133, 3, - 807, 4, -1, -1, 134, 3, 809, 810, 4, -1, - -1, 197, 423, 419, 422, 811, 810, -1, -1, -1, - 135, 3, 813, 814, 4, -1, -1, 197, 423, 419, - 422, 815, 814, -1, -1, -1, 136, 3, 817, 4, - -1, -1, 137, 3, 819, 820, 4, -1, -1, 190, - 423, 68, 422, 821, 820, -1, -1, 190, 423, 198, - 422, 822, 820, -1, -1, -1, 138, 3, 824, 825, - 4, -1, -1, 199, 423, 710, 422, 826, 825, -1, - -1, -1, 139, 3, 828, 829, 4, -1, -1, 190, - 423, 13, 422, 830, 829, -1, -1, 190, 423, 14, - 422, 831, 829, -1, -1, 190, 423, 195, 422, 832, - 829, -1, -1, 190, 423, 196, 422, 833, 829, -1, - -1, 200, 423, 710, 422, 834, 829, -1, -1, 201, - 423, 710, 422, 835, 829, -1, -1, -1, 140, 3, - 837, 4, -1, -1, 141, 3, 839, 4, -1, -1, - 142, 3, 841, 4, -1, -1, 143, 3, 843, 4, - -1, -1, 144, 3, 845, 846, 4, -1, -1, 167, - 423, 33, 422, 847, 846, -1, -1, 167, 423, 168, - 422, 848, 846, -1, -1, 167, 423, 169, 422, 849, - 846, -1, -1, 167, 423, 171, 422, 850, 846, -1, - -1, 167, 423, 68, 422, 851, 846, -1, -1, 170, - 423, 419, 422, 852, 846, -1, -1, 5, 423, 710, - 422, 853, 846, -1, -1, 183, 423, 710, 422, 854, - 846, -1, -1, 172, 423, 710, 422, 855, 846, -1, - -1, 274, 423, 710, 422, 856, 846, -1, -1, -1, - 145, 3, 858, 859, 4, -1, -1, 248, 423, 710, - 422, 860, 859, -1, -1, 286, 423, 710, 422, 861, - 859, -1, -1, 332, 423, 710, 422, 862, 859, -1, - -1, 363, 423, 710, 422, 863, 859, -1, -1, -1, - 146, 3, 865, 866, 4, -1, -1, 190, 423, 13, - 422, 867, 866, -1, -1, 190, 423, 14, 422, 868, - 866, -1, -1, 190, 423, 195, 422, 869, 866, -1, - -1, 190, 423, 196, 422, 870, 866, -1, -1, -1, - 147, 3, 872, 873, 4, -1, -1, 190, 423, 13, - 422, 874, 873, -1, -1, 190, 423, 14, 422, 875, - 873, -1, -1, -1, 148, 3, 877, 878, 4, -1, - -1, 181, 423, 710, 422, 879, 878, -1, -1, 202, - 423, 710, 422, 880, 878, -1, -1, 183, 423, 710, - 422, 881, 878, -1, -1, -1, 149, 3, 883, 884, - 4, -1, -1, 190, 423, 400, 422, 885, 884, -1, - -1, 190, 423, 401, 422, 886, 884, -1, -1, 190, - 423, 402, 422, 887, 884, -1, -1, -1, 150, 3, - 889, 890, 4, -1, -1, 203, 423, 710, 422, 891, - 890, -1, -1, 204, 423, 710, 422, 892, 890, -1, - -1, 166, 423, 710, 422, 893, 890, -1, -1, 183, - 423, 710, 422, 894, 890, -1, -1, -1, 397, 3, - 896, 897, 4, -1, -1, 203, 423, 710, 422, 898, - 897, -1, -1, 204, 423, 710, 422, 899, 897, -1, - -1, 166, 423, 710, 422, 900, 897, -1, -1, 183, - 423, 710, 422, 901, 897, -1, -1, -1, 151, 3, - 903, 904, 4, -1, -1, 190, 423, 419, 422, 905, - 904, -1, -1, -1, 152, 3, 907, 908, 4, -1, - -1, 205, 423, 20, 422, 909, 908, -1, -1, 205, - 423, 21, 422, 910, 908, -1, -1, 205, 423, 27, - 422, 911, 908, -1, -1, 205, 423, 26, 422, 912, - 908, -1, -1, 205, 423, 28, 422, 913, 908, -1, - -1, 205, 423, 22, 422, 914, 908, -1, -1, 205, - 423, 24, 422, 915, 908, -1, -1, 205, 423, 243, - 422, 916, 908, -1, -1, 205, 423, 244, 422, 917, - 908, -1, -1, 205, 423, 23, 422, 918, 908, -1, - -1, 206, 423, 207, 422, 919, 908, -1, -1, 206, - 423, 208, 422, 920, 908, -1, -1, 206, 423, 209, - 422, 921, 908, -1, -1, -1, 153, 3, 923, 924, - 4, -1, -1, 183, 423, 710, 422, 925, 924, -1, - -1, 190, 423, 210, 422, 926, 924, -1, -1, 190, - 423, 211, 422, 927, 924, -1, -1, 190, 423, 212, - 422, 928, 924, -1, -1, 190, 423, 213, 422, 929, - 924, -1, -1, 197, 423, 419, 422, 930, 924, -1, - -1, 314, 423, 419, 422, 931, 924, -1, -1, 315, - 423, 316, 422, 932, 924, -1, -1, 315, 423, 317, - 422, 933, 924, -1, -1, 315, 423, 318, 422, 934, - 924, -1, -1, 319, 423, 321, 422, 935, 924, -1, - -1, 319, 423, 320, 422, 936, 924, -1, -1, 322, - 423, 710, 422, 937, 924, -1, -1, 323, 423, 710, - 422, 938, 924, -1, -1, 324, 423, 710, 422, 939, - 924, -1, -1, -1, 154, 3, 941, 4, -1, -1, - 155, 3, 943, 944, 4, -1, -1, 203, 423, 710, - 422, 945, 944, -1, -1, 204, 423, 710, 422, 946, - 944, -1, -1, 166, 423, 710, 422, 947, 944, -1, - -1, 183, 423, 710, 422, 948, 944, -1, -1, -1, - 214, 3, 950, 951, 4, -1, -1, 22, 423, 215, - 422, 952, 951, -1, -1, 22, 423, 216, 422, 953, - 951, -1, -1, 22, 423, 217, 422, 954, 951, -1, - -1, 22, 423, 218, 422, 955, 951, -1, -1, 22, - 423, 219, 422, 956, 951, -1, -1, 22, 423, 220, - 422, 957, 951, -1, -1, 22, 423, 221, 422, 958, - 951, -1, -1, 22, 423, 222, 422, 959, 951, -1, - -1, 22, 423, 223, 422, 960, 951, -1, -1, 22, - 423, 376, 422, 961, 951, -1, -1, 224, 423, 710, - 422, 962, 951, -1, -1, 225, 423, 710, 422, 963, - 951, -1, -1, 226, 423, 710, 422, 964, 951, -1, - -1, 227, 423, 710, 422, 965, 951, -1, -1, 228, - 423, 420, 422, 966, 951, -1, -1, 217, 423, 419, - 422, 967, 951, -1, -1, 229, 423, 419, 422, 968, - 951, -1, -1, 230, 423, 419, 422, 969, 951, -1, - -1, 231, 423, 419, 422, 970, 951, -1, -1, 232, - 423, 233, 422, 971, 951, -1, -1, 232, 423, 234, - 422, 972, 951, -1, -1, 232, 423, 235, 422, 973, - 951, -1, -1, 236, 423, 710, 422, 974, 951, -1, - -1, 237, 423, 710, 422, 975, 951, -1, -1, 238, - 423, 710, 422, 976, 951, -1, -1, 239, 423, 710, - 422, 977, 951, -1, -1, 240, 423, 419, 422, 978, - 951, -1, -1, 241, 423, 419, 422, 979, 951, -1, - -1, 375, 423, 419, 422, 980, 951, -1, -1, -1, - 242, 3, 982, 4, -1, -1, 263, 3, 984, 4, - -1, -1, 264, 3, 986, 4, -1, -1, 276, 3, - 988, 989, 4, -1, -1, 183, 423, 710, 422, 990, - 989, -1, -1, 277, 423, 419, 422, 991, 989, -1, - -1, 278, 423, 419, 422, 992, 989, -1, -1, 279, - 423, 419, 422, 993, 989, -1, -1, 280, 423, 710, - 422, 994, 989, -1, -1, 281, 423, 710, 422, 995, - 989, -1, -1, 362, 423, 419, 422, 996, 989, -1, - -1, -1, 282, 3, 998, 999, 4, -1, -1, 183, - 423, 710, 422, 1000, 999, -1, -1, 283, 423, 419, - 422, 1001, 999, -1, -1, 284, 423, 191, 422, 1002, - 999, -1, -1, 284, 423, 267, 422, 1003, 999, -1, - -1, -1, 373, 3, 1005, 1006, 4, -1, -1, 374, - 423, 419, 422, 1007, 1006, -1, -1, -1, 293, 3, - 1009, 1010, 4, -1, -1, 294, 423, 419, 422, 1011, - 1010, -1, -1, 295, 423, 710, 422, 1012, 1010, -1, - -1, -1, 299, 3, 1014, 4, -1, -1, 300, 3, - 1016, 1017, 4, -1, -1, 396, 423, 710, 422, 1018, - 1017, -1, -1, -1, 301, 3, 1020, 1021, 4, -1, - -1, 302, 423, 419, 422, 1022, 1021, -1, -1, -1, - 310, 3, 1024, 4, -1, -1, 311, 3, 1026, 1027, - 4, -1, -1, 312, 423, 710, 422, 1028, 1027, -1, - -1, 217, 423, 419, 422, 1029, 1027, -1, -1, -1, - 325, 3, 1031, 1032, 4, -1, -1, 326, 423, 327, - 422, 1033, 1032, -1, -1, 326, 423, 328, 422, 1034, - 1032, -1, -1, 326, 423, 329, 422, 1035, 1032, -1, - -1, 326, 423, 330, 422, 1036, 1032, -1, -1, -1, - 331, 3, 1038, 1039, 4, -1, -1, 43, 422, 1040, - 1039, -1, -1, 46, 422, 1041, 1039, -1, -1, 59, - 422, 1042, 1039, -1, -1, 249, 422, 1043, 1039, -1, - -1, 250, 422, 1044, 1039, -1, -1, 251, 422, 1045, - 1039, -1, -1, 252, 422, 1046, 1039, -1, -1, 253, - 422, 1047, 1039, -1, -1, 254, 422, 1048, 1039, -1, - -1, 256, 423, 710, 422, 1049, 1039, -1, -1, 257, - 423, 710, 422, 1050, 1039, -1, -1, 258, 423, 420, - 422, 1051, 1039, -1, -1, 259, 423, 710, 422, 1052, - 1039, -1, -1, -1, 410, 3, 1054, 1055, 4, -1, - -1, 20, 422, 1056, 1055, -1, -1, 21, 422, 1057, - 1055, -1, -1, 22, 422, 1058, 1055, -1, -1, 23, - 422, 1059, 1055, -1, -1, 24, 422, 1060, 1055, -1, - -1, 25, 422, 1061, 1055, -1, -1, 26, 422, 1062, - 1055, -1, -1, 27, 422, 1063, 1055, -1, -1, 28, - 422, 1064, 1055, -1, -1, 243, 422, 1065, 1055, -1, - -1, 244, 422, 1066, 1055, -1, -1, 245, 422, 1067, - 1055, -1, -1, 355, 422, 1068, 1055, -1, -1, -1, - 333, 3, 1070, 4, -1, -1, 365, 3, 1072, 1073, - 4, -1, -1, 190, 423, 366, 422, 1074, 1073, -1, - -1, 190, 423, 367, 422, 1075, 1073, -1, -1, 190, - 423, 368, 422, 1076, 1073, -1, -1, 369, 423, 420, - 422, 1077, 1073, -1, -1, -1, 371, 3, 1079, 4, - -1, -1, 380, 3, 1081, 1082, 4, -1, -1, 415, - 423, 710, 422, 1083, 1082, -1, -1, -1, 414, 3, - 1085, 4, -1, -1, 416, 3, 1087, 4, -1, -1, - 417, 3, 1089, 4, -1, -1, 418, 3, 1091, 1092, - 4, -1, -1, 375, 423, 419, 422, 1093, 1092, -1, - -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 320, 320, 320, 320, 323, 324, 325, 324, 328, - 329, 330, 329, 341, 342, 341, 353, 354, 353, 365, - 366, 365, 377, 378, 379, 380, 381, 382, 381, 385, - 387, 387, 388, 390, 390, 391, 393, 393, 394, 394, - 395, 395, 396, 396, 397, 398, 398, 399, 399, 400, - 400, 401, 401, 403, 404, 404, 405, 405, 406, 407, - 407, 408, 408, 409, 409, 410, 410, 411, 411, 412, - 413, 415, 415, 416, 416, 417, 417, 418, 418, 419, - 419, 420, 420, 421, 421, 422, 422, 423, 423, 424, - 424, 425, 425, 426, 426, 427, 427, 428, 430, 430, - 431, 433, 433, 434, 434, 435, 437, 437, 438, 438, - 439, 439, 440, 440, 441, 441, 442, 442, 443, 443, - 444, 446, 446, 447, 447, 448, 448, 449, 449, 450, - 450, 451, 451, 452, 452, 453, 453, 454, 454, 455, - 455, 456, 456, 457, 457, 458, 458, 459, 461, 461, - 462, 462, 463, 463, 464, 464, 465, 465, 466, 466, - 467, 467, 468, 468, 469, 469, 470, 470, 471, 471, - 472, 474, 474, 475, 475, 476, 476, 477, 477, 478, - 478, 479, 479, 480, 481, 480, 482, 483, 482, 484, - 485, 484, 486, 488, 488, 490, 490, 492, 492, 494, - 494, 496, 496, 498, 498, 500, 500, 502, 502, 504, - 504, 506, 506, 508, 508, 510, 510, 512, 512, 514, - 514, 516, 516, 517, 517, 521, 521, 525, 525, 529, - 530, 529, 535, 537, 539, 546, 539, 549, 551, 551, - 555, 555, 559, 559, 560, 562, 566, 562, 569, 571, - 571, 574, 574, 575, 577, 577, 578, 578, 579, 579, - 580, 580, 581, 581, 582, 582, 583, 583, 584, 584, - 585, 585, 586, 588, 589, 588, 595, 597, 597, 601, - 601, 602, 602, 605, 605, 606, 607, 606, 619, 621, - 624, 629, 630, 621, 632, 635, 640, 641, 646, 647, - 632, 649, 651, 651, 652, 652, 653, 653, 654, 654, - 655, 655, 656, 656, 657, 657, 658, 658, 659, 661, - 662, 661, 665, 666, 665, 677, 677, 678, 680, 680, - 681, 683, 686, 683, 695, 697, 697, 698, 698, 699, - 699, 700, 700, 701, 701, 703, 703, 704, 704, 705, - 705, 706, 706, 707, 708, 708, 709, 709, 710, 711, - 711, 714, 714, 717, 717, 720, 720, 723, 723, 724, - 724, 725, 725, 726, 726, 727, 727, 728, 728, 729, - 729, 730, 730, 731, 731, 732, 732, 733, 733, 734, - 736, 736, 737, 739, 740, 741, 742, 743, 746, 747, - 746, 760, 761, 760, 774, 775, 774, 788, 789, 788, - 802, 803, 802, 816, 819, 816, 831, 833, 834, 835, - 837, 839, 840, 839, 843, 845, 845, 846, 847, 846, - 860, 861, 860, 873, 875, 876, 875, 882, 884, 884, - 888, 888, 889, 889, 892, 893, 892, 906, 907, 906, - 919, 922, 921, 929, 928, 936, 935, 943, 942, 950, - 949, 957, 956, 963, 966, 965, 973, 972, 980, 979, - 987, 986, 994, 993, 1001, 1000, 1007, 1010, 1009, 1014, - 1013, 1018, 1017, 1022, 1021, 1026, 1025, 1030, 1029, 1034, - 1033, 1038, 1037, 1042, 1041, 1045, 1047, 1047, 1048, 1048, - 1049, 1049, 1050, 1050, 1051, 1051, 1052, 1052, 1053, 1053, - 1054, 1056, 1057, 1059, 1060, 1061, 1062, 1063, 1064, 1065, - 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, - 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, - 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, - 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, - 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, - 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, - 1126, 1127, 1129, 1129, 1132, 1132, 1133, 1133, 1134, 1134, - 1135, 1135, 1136, 1136, 1137, 1137, 1138, 1138, 1139, 1139, - 1140, 1140, 1141, 1141, 1142, 1142, 1143, 1143, 1144, 1144, - 1145, 1145, 1146, 1148, 1148, 1151, 1151, 1154, 1154, 1157, - 1157, 1160, 1160, 1163, 1163, 1164, 1166, 1166, 1169, 1169, - 1172, 1172, 1175, 1175, 1176, 1176, 1177, 1177, 1178, 1180, - 1180, 1183, 1183, 1184, 1184, 1185, 1185, 1186, 1186, 1187, - 1187, 1188, 1188, 1189, 1189, 1190, 1190, 1191, 1191, 1192, - 1192, 1193, 1193, 1194, 1194, 1195, 1195, 1196, 1196, 1197, - 1197, 1198, 1198, 1199, 1199, 1200, 1200, 1201, 1201, 1202, - 1204, 1204, 1207, 1207, 1210, 1210, 1213, 1213, 1216, 1216, - 1219, 1219, 1222, 1222, 1225, 1225, 1228, 1228, 1231, 1231, - 1234, 1234, 1235, 1235, 1236, 1236, 1237, 1237, 1238, 1238, - 1239, 1241, 1241, 1244, 1244, 1245, 1245, 1246, 1246, 1247, - 1247, 1248, 1250, 1250, 1253, 1253, 1256, 1256, 1257, 1259, - 1259, 1262, 1262, 1263, 1265, 1265, 1268, 1268, 1271, 1271, - 1272, 1272, 1273, 1275, 1275, 1278, 1278, 1279, 1281, 1281, - 1284, 1284, 1285, 1285, 1286, 1286, 1287, 1287, 1288, 1288, - 1289, 1289, 1290, 1292, 1292, 1295, 1295, 1298, 1298, 1301, - 1301, 1304, 1304, 1307, 1307, 1308, 1308, 1309, 1309, 1310, - 1310, 1311, 1311, 1312, 1312, 1313, 1313, 1314, 1314, 1315, - 1315, 1316, 1316, 1317, 1319, 1319, 1322, 1322, 1323, 1323, - 1324, 1324, 1325, 1325, 1326, 1328, 1328, 1331, 1331, 1332, - 1332, 1333, 1333, 1334, 1334, 1335, 1337, 1337, 1340, 1340, - 1341, 1341, 1342, 1344, 1344, 1347, 1347, 1348, 1348, 1349, - 1349, 1350, 1352, 1352, 1355, 1355, 1356, 1356, 1357, 1357, - 1358, 1360, 1360, 1363, 1363, 1364, 1364, 1365, 1365, 1366, - 1366, 1367, 1369, 1369, 1372, 1372, 1373, 1373, 1374, 1374, - 1375, 1375, 1376, 1378, 1378, 1381, 1381, 1382, 1384, 1384, - 1389, 1389, 1390, 1390, 1391, 1391, 1392, 1392, 1393, 1393, - 1394, 1394, 1395, 1395, 1396, 1396, 1397, 1397, 1398, 1398, - 1399, 1399, 1400, 1400, 1401, 1401, 1402, 1404, 1404, 1407, - 1407, 1408, 1408, 1409, 1409, 1410, 1410, 1411, 1411, 1412, - 1412, 1413, 1413, 1414, 1414, 1415, 1415, 1416, 1416, 1417, - 1417, 1418, 1418, 1419, 1419, 1420, 1420, 1421, 1421, 1422, - 1424, 1424, 1427, 1427, 1430, 1430, 1431, 1431, 1432, 1432, - 1433, 1433, 1434, 1436, 1436, 1439, 1439, 1440, 1440, 1441, - 1441, 1442, 1442, 1443, 1443, 1444, 1444, 1445, 1445, 1446, - 1446, 1447, 1447, 1448, 1448, 1449, 1449, 1450, 1450, 1451, - 1451, 1452, 1452, 1453, 1453, 1454, 1454, 1455, 1455, 1456, - 1456, 1457, 1457, 1458, 1458, 1459, 1459, 1460, 1460, 1461, - 1461, 1462, 1462, 1463, 1463, 1464, 1464, 1465, 1465, 1466, - 1466, 1467, 1467, 1468, 1470, 1470, 1473, 1473, 1476, 1476, - 1479, 1479, 1482, 1482, 1483, 1483, 1484, 1484, 1485, 1485, - 1486, 1486, 1487, 1487, 1488, 1488, 1489, 1491, 1491, 1494, - 1494, 1495, 1495, 1496, 1496, 1497, 1497, 1499, 1501, 1501, - 1504, 1504, 1505, 1507, 1507, 1510, 1510, 1511, 1511, 1512, - 1514, 1514, 1517, 1517, 1520, 1520, 1521, 1523, 1523, 1526, - 1526, 1527, 1529, 1529, 1532, 1532, 1535, 1535, 1536, 1536, - 1537, 1539, 1539, 1542, 1542, 1543, 1543, 1544, 1544, 1545, - 1545, 1546, 1548, 1548, 1556, 1556, 1557, 1557, 1558, 1558, - 1559, 1559, 1560, 1560, 1561, 1561, 1562, 1562, 1563, 1563, - 1564, 1564, 1565, 1565, 1566, 1566, 1567, 1567, 1568, 1568, - 1569, 1571, 1571, 1579, 1579, 1580, 1580, 1581, 1581, 1582, - 1582, 1583, 1583, 1584, 1584, 1585, 1585, 1586, 1586, 1587, - 1587, 1588, 1588, 1589, 1589, 1590, 1590, 1591, 1591, 1592, - 1594, 1594, 1597, 1597, 1600, 1600, 1601, 1601, 1602, 1602, - 1603, 1603, 1604, 1606, 1606, 1609, 1609, 1612, 1612, 1613, - 1615, 1615, 1618, 1618, 1621, 1621, 1624, 1624, 1627, 1627, - 1628 + 0, 322, 322, 322, 322, 325, 326, 327, 326, 330, + 331, 332, 331, 343, 344, 343, 355, 356, 355, 367, + 368, 367, 379, 380, 381, 382, 383, 384, 383, 387, + 389, 389, 390, 392, 392, 393, 395, 395, 396, 396, + 397, 397, 398, 398, 399, 400, 400, 401, 401, 402, + 402, 403, 403, 405, 406, 406, 407, 407, 408, 409, + 409, 410, 410, 411, 411, 412, 412, 413, 413, 414, + 415, 417, 417, 418, 418, 419, 419, 420, 420, 421, + 421, 422, 422, 423, 423, 424, 424, 425, 425, 426, + 426, 427, 427, 428, 428, 429, 429, 430, 432, 432, + 433, 435, 435, 436, 436, 437, 439, 439, 440, 440, + 441, 441, 442, 442, 443, 443, 444, 444, 445, 445, + 446, 448, 448, 449, 449, 450, 450, 451, 451, 452, + 452, 453, 453, 454, 454, 455, 455, 456, 456, 457, + 457, 458, 458, 459, 459, 460, 460, 461, 463, 463, + 464, 464, 465, 465, 466, 466, 467, 467, 468, 468, + 469, 469, 470, 470, 471, 471, 472, 472, 473, 473, + 474, 476, 476, 477, 477, 478, 478, 479, 479, 480, + 480, 481, 481, 482, 483, 482, 484, 485, 484, 486, + 487, 486, 488, 490, 490, 492, 492, 494, 494, 496, + 496, 498, 498, 500, 500, 502, 502, 504, 504, 506, + 506, 508, 508, 510, 510, 512, 512, 514, 514, 516, + 516, 518, 518, 519, 519, 523, 523, 527, 527, 531, + 532, 531, 537, 539, 541, 548, 541, 551, 553, 553, + 557, 557, 561, 561, 562, 564, 568, 564, 571, 573, + 573, 576, 576, 577, 579, 579, 580, 580, 581, 581, + 582, 582, 583, 583, 584, 584, 585, 585, 586, 586, + 587, 587, 588, 590, 591, 590, 597, 599, 599, 603, + 603, 604, 604, 607, 607, 608, 609, 608, 621, 623, + 626, 631, 632, 623, 634, 637, 642, 643, 648, 649, + 634, 651, 653, 653, 654, 654, 655, 655, 656, 656, + 657, 657, 658, 658, 659, 659, 660, 660, 661, 663, + 664, 663, 667, 668, 667, 679, 679, 680, 682, 682, + 683, 685, 688, 685, 697, 699, 699, 700, 700, 701, + 701, 702, 702, 703, 703, 705, 705, 706, 706, 707, + 707, 708, 708, 709, 710, 710, 711, 711, 712, 713, + 713, 716, 716, 719, 719, 722, 722, 725, 725, 726, + 726, 727, 727, 728, 728, 729, 729, 730, 730, 731, + 731, 732, 732, 733, 733, 734, 734, 735, 735, 736, + 738, 738, 739, 741, 742, 743, 744, 745, 748, 749, + 748, 762, 763, 762, 776, 777, 776, 790, 791, 790, + 804, 805, 804, 818, 821, 818, 833, 835, 836, 837, + 839, 841, 842, 841, 845, 847, 847, 848, 849, 848, + 862, 863, 862, 875, 877, 878, 877, 884, 886, 886, + 890, 890, 891, 891, 894, 895, 894, 908, 909, 908, + 921, 924, 923, 931, 930, 938, 937, 945, 944, 952, + 951, 959, 958, 965, 968, 967, 975, 974, 982, 981, + 989, 988, 996, 995, 1003, 1002, 1009, 1012, 1011, 1016, + 1015, 1020, 1019, 1024, 1023, 1028, 1027, 1032, 1031, 1036, + 1035, 1040, 1039, 1044, 1043, 1047, 1049, 1049, 1050, 1050, + 1051, 1051, 1052, 1052, 1053, 1053, 1054, 1054, 1055, 1055, + 1056, 1058, 1059, 1061, 1062, 1063, 1064, 1065, 1066, 1067, + 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, + 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, + 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, + 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, + 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, + 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, + 1128, 1129, 1130, 1132, 1132, 1135, 1135, 1136, 1136, 1137, + 1137, 1138, 1138, 1139, 1139, 1140, 1140, 1141, 1141, 1142, + 1142, 1143, 1143, 1144, 1144, 1145, 1145, 1146, 1146, 1147, + 1147, 1148, 1148, 1149, 1151, 1151, 1154, 1154, 1157, 1157, + 1160, 1160, 1163, 1163, 1166, 1166, 1167, 1169, 1169, 1172, + 1172, 1175, 1175, 1178, 1178, 1179, 1179, 1180, 1180, 1181, + 1183, 1183, 1186, 1186, 1187, 1187, 1188, 1188, 1189, 1189, + 1190, 1190, 1191, 1191, 1192, 1192, 1193, 1193, 1194, 1194, + 1195, 1195, 1196, 1196, 1197, 1197, 1198, 1198, 1199, 1199, + 1200, 1200, 1201, 1201, 1202, 1202, 1203, 1203, 1204, 1204, + 1205, 1205, 1206, 1208, 1208, 1211, 1211, 1214, 1214, 1217, + 1217, 1220, 1220, 1223, 1223, 1226, 1226, 1229, 1229, 1232, + 1232, 1235, 1235, 1238, 1238, 1239, 1239, 1240, 1240, 1241, + 1241, 1242, 1242, 1243, 1245, 1245, 1248, 1248, 1249, 1249, + 1250, 1250, 1251, 1251, 1252, 1254, 1254, 1257, 1257, 1260, + 1260, 1261, 1263, 1263, 1266, 1266, 1267, 1269, 1269, 1272, + 1272, 1275, 1275, 1276, 1276, 1277, 1279, 1279, 1282, 1282, + 1283, 1285, 1285, 1288, 1288, 1289, 1289, 1290, 1290, 1291, + 1291, 1292, 1292, 1293, 1293, 1294, 1296, 1296, 1299, 1299, + 1302, 1302, 1305, 1305, 1308, 1308, 1311, 1311, 1312, 1312, + 1313, 1313, 1314, 1314, 1315, 1315, 1316, 1316, 1317, 1317, + 1318, 1318, 1319, 1319, 1320, 1320, 1321, 1323, 1323, 1326, + 1326, 1327, 1327, 1328, 1328, 1329, 1329, 1330, 1332, 1332, + 1335, 1335, 1336, 1336, 1337, 1337, 1338, 1338, 1339, 1341, + 1341, 1344, 1344, 1345, 1345, 1346, 1348, 1348, 1351, 1351, + 1352, 1352, 1353, 1353, 1354, 1356, 1356, 1359, 1359, 1360, + 1360, 1361, 1361, 1362, 1364, 1364, 1367, 1367, 1368, 1368, + 1369, 1369, 1370, 1370, 1371, 1373, 1373, 1376, 1376, 1377, + 1377, 1378, 1378, 1379, 1379, 1380, 1382, 1382, 1385, 1385, + 1386, 1388, 1388, 1393, 1393, 1394, 1394, 1395, 1395, 1396, + 1396, 1397, 1397, 1398, 1398, 1399, 1399, 1400, 1400, 1401, + 1401, 1402, 1402, 1403, 1403, 1404, 1404, 1405, 1405, 1406, + 1408, 1408, 1411, 1411, 1412, 1412, 1413, 1413, 1414, 1414, + 1415, 1415, 1416, 1416, 1417, 1417, 1418, 1418, 1419, 1419, + 1420, 1420, 1421, 1421, 1422, 1422, 1423, 1423, 1424, 1424, + 1425, 1425, 1426, 1428, 1428, 1431, 1431, 1434, 1434, 1435, + 1435, 1436, 1436, 1437, 1437, 1438, 1440, 1440, 1443, 1443, + 1444, 1444, 1445, 1445, 1446, 1446, 1447, 1447, 1448, 1448, + 1449, 1449, 1450, 1450, 1451, 1451, 1452, 1452, 1453, 1453, + 1454, 1454, 1455, 1455, 1456, 1456, 1457, 1457, 1458, 1458, + 1459, 1459, 1460, 1460, 1461, 1461, 1462, 1462, 1463, 1463, + 1464, 1464, 1465, 1465, 1466, 1466, 1467, 1467, 1468, 1468, + 1469, 1469, 1470, 1470, 1471, 1471, 1472, 1474, 1474, 1477, + 1477, 1480, 1480, 1483, 1483, 1486, 1486, 1487, 1487, 1488, + 1488, 1489, 1489, 1490, 1490, 1491, 1491, 1492, 1492, 1493, + 1495, 1495, 1498, 1498, 1499, 1499, 1500, 1500, 1501, 1501, + 1503, 1505, 1505, 1508, 1508, 1509, 1511, 1511, 1514, 1514, + 1515, 1515, 1516, 1518, 1518, 1521, 1521, 1524, 1524, 1525, + 1527, 1527, 1530, 1530, 1531, 1533, 1533, 1536, 1536, 1539, + 1539, 1540, 1540, 1541, 1543, 1543, 1546, 1546, 1547, 1547, + 1548, 1548, 1549, 1549, 1550, 1550, 1551, 1551, 1552, 1552, + 1553, 1555, 1555, 1563, 1563, 1564, 1564, 1565, 1565, 1566, + 1566, 1567, 1567, 1568, 1568, 1569, 1569, 1570, 1570, 1571, + 1571, 1572, 1572, 1573, 1573, 1574, 1574, 1575, 1575, 1576, + 1578, 1578, 1586, 1586, 1587, 1587, 1588, 1588, 1589, 1589, + 1590, 1590, 1591, 1591, 1592, 1592, 1593, 1593, 1594, 1594, + 1595, 1595, 1596, 1596, 1597, 1597, 1598, 1598, 1599, 1601, + 1601, 1604, 1604, 1607, 1607, 1608, 1608, 1609, 1609, 1610, + 1610, 1611, 1613, 1613, 1616, 1616, 1619, 1619, 1620, 1622, + 1622, 1625, 1625, 1628, 1628, 1631, 1631, 1634, 1634, 1635, + 1637, 1637 }; #endif @@ -2271,7 +1746,8 @@ "OPTIONMODE_WCP", "INVERT_WCP", "SET_WCP", "CHANGEFILTERS_WCP", "CHANGEBOOKMARKS_WCP", "QUERYLABEL_WCP", "MODIFYTABSOP_WCP", "TABACTION_WCP", "NEWTAB_WCP", "CLOSECURRENTTAB_WCP", "NEXTTAB_WCP", - "PREVTAB_WCP", "CHANGELAYOUTOP_WCP", "INFIXSEARCH_WCP", + "PREVTAB_WCP", "TOGGLELOCKSTATE_WCP", "MOVETABLEFT_WCP", + "MOVETABRIGHT_WCP", "CHANGELAYOUTOP_WCP", "INFIXSEARCH_WCP", "VOLUMEMANAGEROP_WCP", "ERROR", "ACTIVESIDE_WCP", "SHOWFREESPACE_WCP", "ACTIVEMODE_WCP", "ASK_WCP", "SSHALLOW_WCP", "FIELD_WIDTH_WCP", "QUICKSEARCHENABLED_WCP", "FILTEREDSEARCHENABLED_WCP", "XFTFONTS_WCP", @@ -2300,113 +1776,114 @@ "CHANGECOLUMNSOP_WCP", "PATTERNISCOMMASEPARATED_WCP", "STRCASECMP_WCP", "USE_STRING_COMPARE_MODE_WCP", "VIEWNEWESTFILESOP_WCP", "SHOWRECENT_WCP", "DIRCOMPAREOP_WCP", "TABPROFILESOP_WCP", "EXTERNALVDIROP_WCP", - "STRING_WCP", "NUM_WCP", "'.'", "';'", "'='", "','", "$accept", "S", - "$@1", "$@2", "start", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", - "$@10", "$@11", "$@12", "$@13", "$@14", "pjallowdirs", "$@15", - "pathjumpsets", "$@16", "glb", "$@17", "$@18", "$@19", "$@20", "$@21", - "$@22", "$@23", "$@24", "$@25", "$@26", "$@27", "$@28", "$@29", "$@30", - "$@31", "layout", "$@32", "$@33", "$@34", "$@35", "$@36", "$@37", "$@38", - "$@39", "$@40", "$@41", "$@42", "$@43", "$@44", "pal", "$@45", - "listersets", "$@46", "$@47", "listersets2", "$@48", "$@49", "$@50", - "$@51", "$@52", "$@53", "$@54", "displaysets", "$@55", "$@56", "$@57", - "$@58", "$@59", "$@60", "$@61", "$@62", "$@63", "$@64", "$@65", "$@66", - "$@67", "timesets", "$@68", "$@69", "$@70", "$@71", "$@72", "$@73", - "$@74", "$@75", "$@76", "$@77", "$@78", "mouseconf", "$@79", "$@80", - "$@81", "$@82", "$@83", "$@84", "$@85", "$@86", "$@87", "$@88", "$@89", - "$@90", "cols", "$@91", "$@92", "$@93", "$@94", "$@95", "$@96", "$@97", - "$@98", "$@99", "$@100", "$@101", "$@102", "$@103", "$@104", "$@105", - "$@106", "$@107", "$@108", "$@109", "$@110", "labelcolors", "$@111", - "$@112", "labelcolor", "$@113", "$@114", "$@115", "faces", "$@116", - "$@117", "face", "$@118", "$@119", "startup", "$@120", "$@121", "$@122", - "$@123", "$@124", "$@125", "$@126", "$@127", "$@128", "paths", "$@129", - "$@130", "path", "$@131", "$@132", "$@133", "$@134", "$@135", "$@136", - "keylist", "$@137", "$@138", "$@139", "$@140", "$@141", "$@142", "$@143", - "$@144", "$@145", "$@146", "mods", "$@147", "$@148", "$@149", "$@150", - "$@151", "$@152", "$@153", "$@154", "filetypes", "$@155", "$@156", - "$@157", "$@158", "$@159", "ignoredirs", "$@160", "subfiletypes", - "$@161", "$@162", "filetype", "$@163", "$@164", "$@165", "$@166", - "$@167", "$@168", "$@169", "$@170", "$@171", "$@172", "$@173", "$@174", - "$@175", "$@176", "$@177", "$@178", "$@179", "$@180", "$@181", "$@182", - "$@183", "$@184", "$@185", "$@186", "$@187", "$@188", "filecontent", - "$@189", "ft_type", "ftcommands", "$@190", "$@191", "$@192", "$@193", - "$@194", "$@195", "$@196", "$@197", "$@198", "$@199", "$@200", "$@201", - "commands", "flags", "hotkeys", "$@202", "$@203", "hotkey", "$@204", - "$@205", "$@206", "$@207", "$@208", "buttons", "$@209", "$@210", - "button", "$@211", "$@212", "$@213", "$@214", "$@215", "$@216", "$@217", - "fonts", "$@218", "$@219", "$@220", "$@221", "$@222", "$@223", - "xftfonts", "$@224", "$@225", "$@226", "$@227", "$@228", "$@229", - "volumemanager", "$@230", "$@231", "$@232", "$@233", "$@234", "$@235", - "$@236", "$@237", "$@238", "clockbarsets", "$@239", "$@240", "$@241", - "$@242", "$@243", "$@244", "$@245", "bool", "command", "ownop", "$@246", - "ownopbody", "$@247", "$@248", "$@249", "$@250", "$@251", "$@252", - "$@253", "$@254", "$@255", "$@256", "$@257", "$@258", "$@259", "$@260", - "dndaction", "$@261", "dcaction", "$@262", "showaction", "$@263", - "rshowaction", "$@264", "useraction", "$@265", "useractionbody", "$@266", - "rowup", "$@267", "rowdown", "$@268", "changehiddenflag", "$@269", - "changehiddenflagbody", "$@270", "$@271", "$@272", "copyop", "$@273", - "copyopbody", "$@274", "$@275", "$@276", "$@277", "$@278", "$@279", - "$@280", "$@281", "$@282", "$@283", "$@284", "$@285", "$@286", "$@287", - "$@288", "$@289", "$@290", "$@291", "$@292", "firstrow", "$@293", - "lastrow", "$@294", "pageup", "$@295", "pagedown", "$@296", "selectop", - "$@297", "selectallop", "$@298", "selectnoneop", "$@299", "invertallop", - "$@300", "parentdirop", "$@301", "enterdirop", "$@302", "enterdiropbody", - "$@303", "$@304", "$@305", "$@306", "$@307", "changelistersetop", - "$@308", "changelistersetopbody", "$@309", "$@310", "$@311", "$@312", - "switchlisterop", "$@313", "filterselectop", "$@314", - "filterselectopbody", "$@315", "filterunselectop", "$@316", - "filterunselectopbody", "$@317", "pathtoothersideop", "$@318", "quitop", - "$@319", "quitopbody", "$@320", "$@321", "deleteop", "$@322", - "deleteopbody", "$@323", "reloadop", "$@324", "reloadopbody", "$@325", - "$@326", "$@327", "$@328", "$@329", "$@330", "makedirop", "$@331", - "renameop", "$@332", "dirsizeop", "$@333", "simddop", "$@334", - "startprogop", "$@335", "startprogopbody", "$@336", "$@337", "$@338", - "$@339", "$@340", "$@341", "$@342", "$@343", "$@344", "$@345", - "searchentryop", "$@346", "searchentryopbody", "$@347", "$@348", "$@349", - "$@350", "enterpathop", "$@351", "enterpathopbody", "$@352", "$@353", - "$@354", "$@355", "scrolllisterop", "$@356", "scrolllisteropbody", - "$@357", "$@358", "createsymlinkop", "$@359", "createsymlinkopbody", - "$@360", "$@361", "$@362", "changesymlinkop", "$@363", - "changesymlinkopbody", "$@364", "$@365", "$@366", "chmodop", "$@367", - "chmodopbody", "$@368", "$@369", "$@370", "$@371", "chtimeop", "$@372", - "chtimeopbody", "$@373", "$@374", "$@375", "$@376", "togglelistermodeop", - "$@377", "togglelistermodeopbody", "$@378", "setsortmodeop", "$@379", - "setsortmodeopbody", "$@380", "$@381", "$@382", "$@383", "$@384", - "$@385", "$@386", "$@387", "$@388", "$@389", "$@390", "$@391", "$@392", - "setfilterop", "$@393", "setfilteropbody", "$@394", "$@395", "$@396", - "$@397", "$@398", "$@399", "$@400", "$@401", "$@402", "$@403", "$@404", - "$@405", "$@406", "$@407", "$@408", "shortkeyfromlistop", "$@409", - "chownop", "$@410", "chownopbody", "$@411", "$@412", "$@413", "$@414", - "scriptop", "$@415", "scriptopbody", "$@416", "$@417", "$@418", "$@419", - "$@420", "$@421", "$@422", "$@423", "$@424", "$@425", "$@426", "$@427", - "$@428", "$@429", "$@430", "$@431", "$@432", "$@433", "$@434", "$@435", - "$@436", "$@437", "$@438", "$@439", "$@440", "$@441", "$@442", "$@443", - "$@444", "showdircacheop", "$@445", "parentactionop", "$@446", - "nooperationop", "$@447", "goftpop", "$@448", "goftpopbody", "$@449", - "$@450", "$@451", "$@452", "$@453", "$@454", "$@455", "internalviewop", - "$@456", "internalviewopbody", "$@457", "$@458", "$@459", "$@460", - "clipboardop", "$@461", "clipboardopbody", "$@462", "searchop", "$@463", - "searchopbody", "$@464", "$@465", "dirbookmarkop", "$@466", - "opencontextmenuop", "$@467", "opencontextmenuopbody", "$@468", - "runcustomaction", "$@469", "runcustomactionbody", "$@470", - "openworkermenuop", "$@471", "changelabelop", "$@472", - "changelabelopbody", "$@473", "$@474", "modifytabsop", "$@475", - "modifytabsopbody", "$@476", "$@477", "$@478", "$@479", "changelayoutop", - "$@480", "changelayoutopbody", "$@481", "$@482", "$@483", "$@484", - "$@485", "$@486", "$@487", "$@488", "$@489", "$@490", "$@491", "$@492", - "$@493", "changecolumnsop", "$@494", "changecolumnsopbody", "$@495", - "$@496", "$@497", "$@498", "$@499", "$@500", "$@501", "$@502", "$@503", - "$@504", "$@505", "$@506", "$@507", "volumemanagerop", "$@508", - "switchbuttonbankop", "$@509", "switchbuttonbankopbody", "$@510", - "$@511", "$@512", "$@513", "pathjumpop", "$@514", "commandmenuop", - "$@515", "commandmenuopbody", "$@516", "viewnewestfilesop", "$@517", - "dircompareop", "$@518", "tabprofilesop", "$@519", "externalvdirop", - "$@520", "externalvdiropbody", "$@521", YY_NULL + "VDIR_PRESERVE_DIR_STRUCTURE_WCP", "OPENTABMENUOP_WCP", "STRING_WCP", + "NUM_WCP", "'.'", "';'", "'='", "','", "$accept", "S", "$@1", "$@2", + "start", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", + "$@12", "$@13", "$@14", "pjallowdirs", "$@15", "pathjumpsets", "$@16", + "glb", "$@17", "$@18", "$@19", "$@20", "$@21", "$@22", "$@23", "$@24", + "$@25", "$@26", "$@27", "$@28", "$@29", "$@30", "$@31", "layout", "$@32", + "$@33", "$@34", "$@35", "$@36", "$@37", "$@38", "$@39", "$@40", "$@41", + "$@42", "$@43", "$@44", "pal", "$@45", "listersets", "$@46", "$@47", + "listersets2", "$@48", "$@49", "$@50", "$@51", "$@52", "$@53", "$@54", + "displaysets", "$@55", "$@56", "$@57", "$@58", "$@59", "$@60", "$@61", + "$@62", "$@63", "$@64", "$@65", "$@66", "$@67", "timesets", "$@68", + "$@69", "$@70", "$@71", "$@72", "$@73", "$@74", "$@75", "$@76", "$@77", + "$@78", "mouseconf", "$@79", "$@80", "$@81", "$@82", "$@83", "$@84", + "$@85", "$@86", "$@87", "$@88", "$@89", "$@90", "cols", "$@91", "$@92", + "$@93", "$@94", "$@95", "$@96", "$@97", "$@98", "$@99", "$@100", "$@101", + "$@102", "$@103", "$@104", "$@105", "$@106", "$@107", "$@108", "$@109", + "$@110", "labelcolors", "$@111", "$@112", "labelcolor", "$@113", "$@114", + "$@115", "faces", "$@116", "$@117", "face", "$@118", "$@119", "startup", + "$@120", "$@121", "$@122", "$@123", "$@124", "$@125", "$@126", "$@127", + "$@128", "paths", "$@129", "$@130", "path", "$@131", "$@132", "$@133", + "$@134", "$@135", "$@136", "keylist", "$@137", "$@138", "$@139", "$@140", + "$@141", "$@142", "$@143", "$@144", "$@145", "$@146", "mods", "$@147", + "$@148", "$@149", "$@150", "$@151", "$@152", "$@153", "$@154", + "filetypes", "$@155", "$@156", "$@157", "$@158", "$@159", "ignoredirs", + "$@160", "subfiletypes", "$@161", "$@162", "filetype", "$@163", "$@164", + "$@165", "$@166", "$@167", "$@168", "$@169", "$@170", "$@171", "$@172", + "$@173", "$@174", "$@175", "$@176", "$@177", "$@178", "$@179", "$@180", + "$@181", "$@182", "$@183", "$@184", "$@185", "$@186", "$@187", "$@188", + "filecontent", "$@189", "ft_type", "ftcommands", "$@190", "$@191", + "$@192", "$@193", "$@194", "$@195", "$@196", "$@197", "$@198", "$@199", + "$@200", "$@201", "commands", "flags", "hotkeys", "$@202", "$@203", + "hotkey", "$@204", "$@205", "$@206", "$@207", "$@208", "buttons", + "$@209", "$@210", "button", "$@211", "$@212", "$@213", "$@214", "$@215", + "$@216", "$@217", "fonts", "$@218", "$@219", "$@220", "$@221", "$@222", + "$@223", "xftfonts", "$@224", "$@225", "$@226", "$@227", "$@228", + "$@229", "volumemanager", "$@230", "$@231", "$@232", "$@233", "$@234", + "$@235", "$@236", "$@237", "$@238", "clockbarsets", "$@239", "$@240", + "$@241", "$@242", "$@243", "$@244", "$@245", "bool", "command", "ownop", + "$@246", "ownopbody", "$@247", "$@248", "$@249", "$@250", "$@251", + "$@252", "$@253", "$@254", "$@255", "$@256", "$@257", "$@258", "$@259", + "$@260", "dndaction", "$@261", "dcaction", "$@262", "showaction", + "$@263", "rshowaction", "$@264", "useraction", "$@265", "useractionbody", + "$@266", "rowup", "$@267", "rowdown", "$@268", "changehiddenflag", + "$@269", "changehiddenflagbody", "$@270", "$@271", "$@272", "copyop", + "$@273", "copyopbody", "$@274", "$@275", "$@276", "$@277", "$@278", + "$@279", "$@280", "$@281", "$@282", "$@283", "$@284", "$@285", "$@286", + "$@287", "$@288", "$@289", "$@290", "$@291", "$@292", "$@293", + "firstrow", "$@294", "lastrow", "$@295", "pageup", "$@296", "pagedown", + "$@297", "selectop", "$@298", "selectallop", "$@299", "selectnoneop", + "$@300", "invertallop", "$@301", "parentdirop", "$@302", "enterdirop", + "$@303", "enterdiropbody", "$@304", "$@305", "$@306", "$@307", "$@308", + "changelistersetop", "$@309", "changelistersetopbody", "$@310", "$@311", + "$@312", "$@313", "switchlisterop", "$@314", "filterselectop", "$@315", + "filterselectopbody", "$@316", "filterunselectop", "$@317", + "filterunselectopbody", "$@318", "pathtoothersideop", "$@319", "quitop", + "$@320", "quitopbody", "$@321", "$@322", "deleteop", "$@323", + "deleteopbody", "$@324", "reloadop", "$@325", "reloadopbody", "$@326", + "$@327", "$@328", "$@329", "$@330", "$@331", "makedirop", "$@332", + "renameop", "$@333", "dirsizeop", "$@334", "simddop", "$@335", + "startprogop", "$@336", "startprogopbody", "$@337", "$@338", "$@339", + "$@340", "$@341", "$@342", "$@343", "$@344", "$@345", "$@346", + "searchentryop", "$@347", "searchentryopbody", "$@348", "$@349", "$@350", + "$@351", "enterpathop", "$@352", "enterpathopbody", "$@353", "$@354", + "$@355", "$@356", "scrolllisterop", "$@357", "scrolllisteropbody", + "$@358", "$@359", "createsymlinkop", "$@360", "createsymlinkopbody", + "$@361", "$@362", "$@363", "changesymlinkop", "$@364", + "changesymlinkopbody", "$@365", "$@366", "$@367", "chmodop", "$@368", + "chmodopbody", "$@369", "$@370", "$@371", "$@372", "chtimeop", "$@373", + "chtimeopbody", "$@374", "$@375", "$@376", "$@377", "togglelistermodeop", + "$@378", "togglelistermodeopbody", "$@379", "setsortmodeop", "$@380", + "setsortmodeopbody", "$@381", "$@382", "$@383", "$@384", "$@385", + "$@386", "$@387", "$@388", "$@389", "$@390", "$@391", "$@392", "$@393", + "setfilterop", "$@394", "setfilteropbody", "$@395", "$@396", "$@397", + "$@398", "$@399", "$@400", "$@401", "$@402", "$@403", "$@404", "$@405", + "$@406", "$@407", "$@408", "$@409", "shortkeyfromlistop", "$@410", + "chownop", "$@411", "chownopbody", "$@412", "$@413", "$@414", "$@415", + "scriptop", "$@416", "scriptopbody", "$@417", "$@418", "$@419", "$@420", + "$@421", "$@422", "$@423", "$@424", "$@425", "$@426", "$@427", "$@428", + "$@429", "$@430", "$@431", "$@432", "$@433", "$@434", "$@435", "$@436", + "$@437", "$@438", "$@439", "$@440", "$@441", "$@442", "$@443", "$@444", + "$@445", "showdircacheop", "$@446", "parentactionop", "$@447", + "nooperationop", "$@448", "goftpop", "$@449", "goftpopbody", "$@450", + "$@451", "$@452", "$@453", "$@454", "$@455", "$@456", "internalviewop", + "$@457", "internalviewopbody", "$@458", "$@459", "$@460", "$@461", + "clipboardop", "$@462", "clipboardopbody", "$@463", "searchop", "$@464", + "searchopbody", "$@465", "$@466", "dirbookmarkop", "$@467", + "opencontextmenuop", "$@468", "opencontextmenuopbody", "$@469", + "runcustomaction", "$@470", "runcustomactionbody", "$@471", + "openworkermenuop", "$@472", "changelabelop", "$@473", + "changelabelopbody", "$@474", "$@475", "modifytabsop", "$@476", + "modifytabsopbody", "$@477", "$@478", "$@479", "$@480", "$@481", "$@482", + "$@483", "changelayoutop", "$@484", "changelayoutopbody", "$@485", + "$@486", "$@487", "$@488", "$@489", "$@490", "$@491", "$@492", "$@493", + "$@494", "$@495", "$@496", "$@497", "changecolumnsop", "$@498", + "changecolumnsopbody", "$@499", "$@500", "$@501", "$@502", "$@503", + "$@504", "$@505", "$@506", "$@507", "$@508", "$@509", "$@510", "$@511", + "volumemanagerop", "$@512", "switchbuttonbankop", "$@513", + "switchbuttonbankopbody", "$@514", "$@515", "$@516", "$@517", + "pathjumpop", "$@518", "commandmenuop", "$@519", "commandmenuopbody", + "$@520", "viewnewestfilesop", "$@521", "dircompareop", "$@522", + "tabprofilesop", "$@523", "externalvdirop", "$@524", + "externalvdiropbody", "$@525", "opentabmenuop", "$@526", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -2451,259 +1928,310 @@ 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, - 675, 46, 59, 61, 44 + 675, 676, 677, 678, 679, 680, 46, 59, 61, 44 }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint16 yyr1[] = -{ - 0, 425, 427, 428, 426, 429, 430, 431, 429, 429, - 432, 433, 429, 434, 435, 429, 436, 437, 429, 438, - 439, 429, 429, 429, 429, 429, 440, 441, 429, 429, - 443, 442, 442, 445, 444, 444, 447, 446, 448, 446, - 449, 446, 450, 446, 446, 451, 446, 452, 446, 453, - 446, 454, 446, 446, 455, 446, 456, 446, 446, 457, - 446, 458, 446, 459, 446, 460, 446, 461, 446, 446, - 446, 463, 462, 464, 462, 465, 462, 466, 462, 467, - 462, 468, 462, 469, 462, 470, 462, 471, 462, 472, - 462, 473, 462, 474, 462, 475, 462, 462, 477, 476, - 476, 479, 478, 480, 478, 478, 482, 481, 483, 481, - 484, 481, 485, 481, 486, 481, 487, 481, 488, 481, - 481, 490, 489, 491, 489, 492, 489, 493, 489, 494, - 489, 495, 489, 496, 489, 497, 489, 498, 489, 499, - 489, 500, 489, 501, 489, 502, 489, 489, 504, 503, - 505, 503, 506, 503, 507, 503, 508, 503, 509, 503, - 510, 503, 511, 503, 512, 503, 513, 503, 514, 503, - 503, 516, 515, 517, 515, 518, 515, 519, 515, 520, - 515, 521, 515, 522, 523, 515, 524, 525, 515, 526, - 527, 515, 515, 529, 528, 530, 528, 531, 528, 532, - 528, 533, 528, 534, 528, 535, 528, 536, 528, 537, - 528, 538, 528, 539, 528, 540, 528, 541, 528, 542, - 528, 543, 528, 544, 528, 545, 528, 546, 528, 547, - 548, 528, 528, 528, 550, 551, 549, 549, 553, 552, - 554, 552, 555, 552, 552, 557, 558, 556, 556, 560, - 559, 561, 559, 559, 563, 562, 564, 562, 565, 562, - 566, 562, 567, 562, 568, 562, 569, 562, 570, 562, - 571, 562, 562, 573, 574, 572, 572, 576, 575, 577, - 575, 578, 575, 579, 575, 580, 581, 575, 575, 583, - 584, 585, 586, 582, 587, 588, 589, 590, 591, 592, - 582, 582, 594, 593, 595, 593, 596, 593, 597, 593, - 598, 593, 599, 593, 600, 593, 601, 593, 593, 603, - 604, 602, 605, 606, 602, 607, 602, 602, 609, 608, - 608, 611, 612, 610, 610, 614, 613, 615, 613, 616, - 613, 617, 613, 618, 613, 619, 613, 620, 613, 621, - 613, 622, 613, 613, 623, 613, 624, 613, 613, 625, - 613, 626, 613, 627, 613, 628, 613, 629, 613, 630, - 613, 631, 613, 632, 613, 633, 613, 634, 613, 635, - 613, 636, 613, 637, 613, 638, 613, 639, 613, 613, - 641, 640, 640, 642, 642, 642, 642, 642, 644, 645, - 643, 646, 647, 643, 648, 649, 643, 650, 651, 643, - 652, 653, 643, 654, 655, 643, 643, 656, 656, 656, - 657, 659, 660, 658, 658, 662, 661, 663, 664, 661, - 665, 666, 661, 661, 668, 669, 667, 667, 671, 670, - 672, 670, 673, 670, 674, 675, 670, 676, 677, 670, - 670, 679, 678, 680, 678, 681, 678, 682, 678, 683, - 678, 684, 678, 678, 686, 685, 687, 685, 688, 685, - 689, 685, 690, 685, 691, 685, 685, 693, 692, 694, - 692, 695, 692, 696, 692, 697, 692, 698, 692, 699, - 692, 700, 692, 701, 692, 692, 703, 702, 704, 702, - 705, 702, 706, 702, 707, 702, 708, 702, 709, 702, - 702, 710, 710, 711, 711, 711, 711, 711, 711, 711, - 711, 711, 711, 711, 711, 711, 711, 711, 711, 711, - 711, 711, 711, 711, 711, 711, 711, 711, 711, 711, - 711, 711, 711, 711, 711, 711, 711, 711, 711, 711, - 711, 711, 711, 711, 711, 711, 711, 711, 711, 711, - 711, 711, 711, 711, 711, 711, 711, 711, 711, 711, - 711, 711, 711, 711, 711, 711, 711, 711, 711, 711, - 711, 711, 713, 712, 715, 714, 716, 714, 717, 714, - 718, 714, 719, 714, 720, 714, 721, 714, 722, 714, - 723, 714, 724, 714, 725, 714, 726, 714, 727, 714, - 728, 714, 714, 730, 729, 732, 731, 734, 733, 736, - 735, 738, 737, 740, 739, 739, 742, 741, 744, 743, - 746, 745, 748, 747, 749, 747, 750, 747, 747, 752, - 751, 754, 753, 755, 753, 756, 753, 757, 753, 758, - 753, 759, 753, 760, 753, 761, 753, 762, 753, 763, - 753, 764, 753, 765, 753, 766, 753, 767, 753, 768, - 753, 769, 753, 770, 753, 771, 753, 772, 753, 753, - 774, 773, 776, 775, 778, 777, 780, 779, 782, 781, - 784, 783, 786, 785, 788, 787, 790, 789, 792, 791, - 794, 793, 795, 793, 796, 793, 797, 793, 798, 793, - 793, 800, 799, 802, 801, 803, 801, 804, 801, 805, - 801, 801, 807, 806, 809, 808, 811, 810, 810, 813, - 812, 815, 814, 814, 817, 816, 819, 818, 821, 820, - 822, 820, 820, 824, 823, 826, 825, 825, 828, 827, - 830, 829, 831, 829, 832, 829, 833, 829, 834, 829, - 835, 829, 829, 837, 836, 839, 838, 841, 840, 843, - 842, 845, 844, 847, 846, 848, 846, 849, 846, 850, - 846, 851, 846, 852, 846, 853, 846, 854, 846, 855, - 846, 856, 846, 846, 858, 857, 860, 859, 861, 859, - 862, 859, 863, 859, 859, 865, 864, 867, 866, 868, - 866, 869, 866, 870, 866, 866, 872, 871, 874, 873, - 875, 873, 873, 877, 876, 879, 878, 880, 878, 881, - 878, 878, 883, 882, 885, 884, 886, 884, 887, 884, - 884, 889, 888, 891, 890, 892, 890, 893, 890, 894, - 890, 890, 896, 895, 898, 897, 899, 897, 900, 897, - 901, 897, 897, 903, 902, 905, 904, 904, 907, 906, - 909, 908, 910, 908, 911, 908, 912, 908, 913, 908, - 914, 908, 915, 908, 916, 908, 917, 908, 918, 908, - 919, 908, 920, 908, 921, 908, 908, 923, 922, 925, - 924, 926, 924, 927, 924, 928, 924, 929, 924, 930, - 924, 931, 924, 932, 924, 933, 924, 934, 924, 935, - 924, 936, 924, 937, 924, 938, 924, 939, 924, 924, - 941, 940, 943, 942, 945, 944, 946, 944, 947, 944, - 948, 944, 944, 950, 949, 952, 951, 953, 951, 954, - 951, 955, 951, 956, 951, 957, 951, 958, 951, 959, - 951, 960, 951, 961, 951, 962, 951, 963, 951, 964, - 951, 965, 951, 966, 951, 967, 951, 968, 951, 969, - 951, 970, 951, 971, 951, 972, 951, 973, 951, 974, - 951, 975, 951, 976, 951, 977, 951, 978, 951, 979, - 951, 980, 951, 951, 982, 981, 984, 983, 986, 985, - 988, 987, 990, 989, 991, 989, 992, 989, 993, 989, - 994, 989, 995, 989, 996, 989, 989, 998, 997, 1000, - 999, 1001, 999, 1002, 999, 1003, 999, 999, 1005, 1004, - 1007, 1006, 1006, 1009, 1008, 1011, 1010, 1012, 1010, 1010, - 1014, 1013, 1016, 1015, 1018, 1017, 1017, 1020, 1019, 1022, - 1021, 1021, 1024, 1023, 1026, 1025, 1028, 1027, 1029, 1027, - 1027, 1031, 1030, 1033, 1032, 1034, 1032, 1035, 1032, 1036, - 1032, 1032, 1038, 1037, 1040, 1039, 1041, 1039, 1042, 1039, - 1043, 1039, 1044, 1039, 1045, 1039, 1046, 1039, 1047, 1039, - 1048, 1039, 1049, 1039, 1050, 1039, 1051, 1039, 1052, 1039, - 1039, 1054, 1053, 1056, 1055, 1057, 1055, 1058, 1055, 1059, - 1055, 1060, 1055, 1061, 1055, 1062, 1055, 1063, 1055, 1064, - 1055, 1065, 1055, 1066, 1055, 1067, 1055, 1068, 1055, 1055, - 1070, 1069, 1072, 1071, 1074, 1073, 1075, 1073, 1076, 1073, - 1077, 1073, 1073, 1079, 1078, 1081, 1080, 1083, 1082, 1082, - 1085, 1084, 1087, 1086, 1089, 1088, 1091, 1090, 1093, 1092, - 1092 -}; +#define YYPACT_NINF -2119 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-2119))) + +#define YYTABLE_NINF -1 + +#define yytable_value_is_error(Yytable_value) \ + 0 + + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +static const yytype_int16 yypact[] = { - 0, 2, 0, 0, 10, 5, 0, 0, 7, 5, - 0, 0, 7, 0, 0, 7, 0, 0, 7, 0, - 0, 7, 5, 5, 5, 5, 0, 0, 7, 0, - 0, 4, 0, 0, 6, 0, 0, 6, 0, 6, - 0, 6, 0, 6, 5, 0, 6, 0, 6, 0, - 6, 0, 6, 5, 0, 6, 0, 6, 5, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 5, - 0, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 0, 10, - 0, 0, 6, 0, 6, 0, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 4, 0, 4, 0, 4, 0, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 0, 7, 0, 0, 7, 0, - 0, 7, 0, 0, 8, 0, 8, 0, 8, 0, - 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, - 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, - 8, 0, 6, 0, 8, 0, 8, 0, 8, 0, - 0, 7, 5, 0, 0, 0, 7, 0, 0, 8, - 0, 8, 0, 6, 0, 0, 0, 7, 0, 0, - 6, 0, 6, 0, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 0, 0, 7, 0, 0, 6, 0, - 6, 0, 8, 0, 6, 0, 0, 7, 0, 0, - 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, - 20, 0, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 0, - 0, 7, 0, 0, 7, 0, 6, 0, 0, 4, - 0, 0, 0, 7, 0, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 5, 0, 6, 0, 6, 5, 0, - 8, 0, 8, 0, 8, 0, 8, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 0, 6, 0, 1, 1, 1, 1, 1, 0, 0, - 7, 0, 0, 7, 0, 0, 7, 0, 0, 7, - 0, 0, 8, 0, 0, 14, 0, 2, 5, 0, - 0, 0, 0, 7, 0, 0, 6, 0, 0, 7, - 0, 0, 7, 0, 0, 0, 7, 0, 0, 6, - 0, 6, 0, 8, 0, 0, 7, 0, 0, 7, - 0, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 5, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 5, 0, 6, 0, 0, 4, 0, 4, - 0, 5, 0, 6, 0, 6, 0, 6, 0, 0, - 5, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 5, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 0, 5, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 0, 4, 0, 5, 0, 6, 0, 0, - 5, 0, 6, 0, 0, 4, 0, 5, 0, 6, - 0, 6, 0, 0, 5, 0, 6, 0, 0, 5, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 5, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 0, 5, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 0, 5, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 0, 5, 0, 6, - 0, 6, 0, 0, 5, 0, 6, 0, 6, 0, - 6, 0, 0, 5, 0, 6, 0, 6, 0, 6, - 0, 0, 5, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 0, 5, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 0, 5, 0, 6, 0, 0, 5, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 0, 5, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 0, 4, 0, 5, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 0, 5, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 0, 4, 0, 4, 0, 4, - 0, 5, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 6, 0, 6, 0, 0, 5, 0, - 6, 0, 6, 0, 6, 0, 6, 0, 0, 5, - 0, 6, 0, 0, 5, 0, 6, 0, 6, 0, - 0, 4, 0, 5, 0, 6, 0, 0, 5, 0, - 6, 0, 0, 4, 0, 5, 0, 6, 0, 6, - 0, 0, 5, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 0, 5, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 6, 0, 6, 0, 6, 0, 6, - 0, 0, 5, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 0, 4, 0, 5, 0, 6, 0, 6, 0, 6, - 0, 6, 0, 0, 4, 0, 5, 0, 6, 0, - 0, 4, 0, 4, 0, 4, 0, 5, 0, 6, - 0 + -2119, 57, -29, -2119, -320, -296, -282, -275, -271, -265, + -2119, 44, 153, 182, 189, 209, 231, 263, 265, 313, + 337, 400, 429, 436, -2119, 138, -2119, 9, -2119, -2119, + -2119, -2119, 688, 456, 695, -2119, 32, 45, 481, 489, + 78, 89, 90, 92, 93, 100, 492, 501, 504, 101, + 523, 124, 125, 139, 141, 538, 275, 146, 154, 155, + 158, 546, 529, 544, 18, 508, 183, 187, 188, 197, + 198, 200, 631, 211, 212, 224, 228, 633, 230, 235, + 236, 277, 292, 310, 662, 323, 325, 733, 366, -2119, + 98, 412, 414, 423, 122, 416, 171, 402, -2119, 371, + 171, 370, 171, 171, 171, 438, 44, 426, 427, 433, + 446, 471, 564, 616, 617, 618, 619, 620, 621, 622, + 623, 624, 625, 626, 627, 926, 1053, -2119, 634, 635, + -51, -91, 44, 1054, 1056, 1058, 1059, 1061, 1062, 638, + 1063, 1065, 1066, 645, 647, 648, 649, 650, 651, 44, + 67, 637, 652, 171, 44, 653, 654, 655, 656, 657, + 658, 44, 659, 1079, 171, 44, 660, 663, -2119, -2119, + 1080, 664, 665, 666, 667, 668, 669, -2119, -2119, 670, + 661, 671, 672, 673, 674, 675, 1081, 432, 676, 677, + 678, 679, 680, 1087, 1095, 1106, 1107, 683, 684, 685, + 686, 687, 689, 690, 691, 692, 693, 1112, 696, 697, + 698, 699, -2119, 702, 703, 704, 705, 706, 707, 708, + 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, + 719, -2119, 731, 1141, 720, 721, 722, 723, 724, 725, + 726, 727, 728, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + 171, -2119, -2119, -2119, 729, 730, 732, 734, 735, 736, + -2119, 737, 738, 739, 740, 741, 742, 743, -2119, 744, + 745, 746, 747, 748, 749, -2119, -2119, -2119, 750, -2119, + -2119, 751, 1142, 1155, 1157, 138, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, 84, 96, 171, 171, 754, 756, 138, + 755, 757, 758, 759, 760, 761, 762, 763, 764, 753, + 765, 766, 767, 1179, 771, 772, 773, -25, 774, -2119, + -2119, -2119, 138, -2119, 768, 776, 777, 778, 779, 171, + 780, 781, 782, 138, -2119, -2119, -2119, -2119, 783, 784, + 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, + 795, 798, 797, 799, 800, 801, 1046, 1205, 1206, 44, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 79, + 44, 420, 44, 152, 803, 804, 44, 62, 44, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 323, 44, + -2119, 138, 807, 138, 23, 23, -2119, 138, 138, 138, + 138, 138, 138, 138, 806, 808, 809, 810, 811, 812, + 813, 814, 815, 817, 818, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, 171, 171, 821, 171, 138, + 820, 822, 823, 824, 825, 826, 1105, 1105, 1105, -2119, + 138, 827, 828, 829, 830, 831, 832, 833, 834, 835, + -2119, 138, 138, 138, 138, 838, 839, 840, 841, 842, + 843, 844, 845, 846, 847, 848, 849, 850, -2119, 851, + 852, 853, 854, 1208, 1230, -2119, 275, -2119, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 855, 856, 1240, + 1245, 857, 1276, -2119, 858, 859, 1278, 860, 861, 1286, + -2119, 863, 864, 865, 866, 867, 1279, 1293, 869, 870, + 871, 872, 873, 1299, 875, 876, 877, 878, 879, 880, + 881, 882, 883, 884, 885, 886, 1311, 889, 1313, -2119, + -2119, 890, 1316, 1317, 1318, -2119, 688, 688, 688, 688, + 688, 688, 456, 456, 456, 456, 456, 456, 456, 695, + 695, 695, 695, 695, 695, -2119, -2119, 32, -2119, 892, + -2119, 895, 896, 897, 898, 1324, 900, 901, 1326, 1327, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 432, 432, + 432, 432, 432, 432, 432, 432, 432, 905, 906, 907, + 908, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 909, 1332, + 1334, 1335, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, 913, 914, 915, 916, + 917, 918, 919, 920, 921, 922, 923, 924, 925, 275, + 927, 928, 929, 930, -2119, -2119, 24, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, 933, 935, -2119, + -2119, 936, -2119, 937, 939, -2119, 940, 941, -2119, 600, + 943, 171, 171, 944, -2119, -54, 171, 171, 171, 945, + 171, 1298, -43, 946, 947, 948, 949, 951, 171, 952, + 171, 171, 171, 171, -2119, -2119, -2119, 18, 953, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, 954, 171, 955, 171, 956, -2119, 171, 171, + 98, 98, 402, 402, 402, 402, 402, 402, 402, 402, + 402, 402, 402, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, 371, 371, 371, 371, + 371, 371, 816, -2119, -2119, -2119, 370, 370, 370, 370, + 370, 370, 370, 370, 370, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, 49, 275, 932, 942, 1349, 957, 958, + 234, 46, 959, 529, 960, 962, 46, 963, 964, 544, + -2119, -2119, -2119, -2119, -2119, 965, 967, 968, 969, 970, + 961, 1375, 1379, 1380, 1388, 973, 1396, 1397, 975, 976, + 977, 978, 979, 1404, 1405, 981, 983, 984, 985, 971, + 986, 987, 988, 991, 992, 993, 994, 995, 996, 997, + 18, 803, 18, -2119, 998, 234, 46, 508, 999, 1000, + 1002, 1003, 1004, 38, 1005, 1006, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 432, + 432, 432, 432, -2119, -2119, -2119, -2119, -2119, -2119, 1007, + 1008, 1009, 1010, 1011, 1012, 1013, 1014, 371, 371, 371, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 1015, 1016, 1017, 1409, + -2119, 990, 1001, -2119, -2119, -2119, 1439, 1443, 1444, 1445, + 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, + 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463, 1464, 1465, + 1466, 1467, 1468, 1469, 1470, 1471, 1472, 1473, 1474, 1475, + 1476, 1477, 1478, 1479, 1480, 1481, 1482, 1483, 1484, 1485, + 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, + 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, + 1506, 1507, 1508, 1509, 1510, 1511, 1512, 1513, 234, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 1515, + 1516, 1517, 1091, -2119, -2119, -2119, 1518, -2119, 1098, -2119, + -2119, -2119, -2119, -2119, -2119, 1092, 1520, -2119, -2119, -2119, + -2119, 1522, -2119, 152, -2119, -2119, -2119, -2119, -2119, -2119, + 152, -2119, -2119, -2119, -2119, 1101, 1102, 1103, 1104, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + 1526, 1527, -2119, 1108, -2119, -2119, -2119, -2119, 1109, 1110, + 1111, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, + 1122, 1528, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, 1126, 1127, 1128, -2119, + 1124, 1129, 731, 79, 79, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, 1130, 420, 420, -2119, 420, 1131, 152, 152, 152, + 152, 152, 1134, 152, 234, 234, 234, 234, -2119, 1514, + -2119, 152, 152, 152, 152, 152, 152, -2119, 152, 152, + 152, 152, 1133, 1135, 1136, 1137, 152, 152, 152, 152, + 152, 152, 152, 62, -2119, -2119, 1138, 23, 23, 23, + 23, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, 23, 23, 23, 1105, 1105, 1105, + 1105, 1105, 1105, 1105, 1105, 1139, 1125, 1132, 1046, -2119, + -2119, -2119, -2119, -2119, -74, 1531, 1535, 1551, 1563, 1564, + 1395, 1566, 1567, 1398, 440, 1568, 1570, 1571, 1572, 1573, + 1574, 1575, 1576, 1577, 17, 1392, 1579, 1387, 1389, 1581, + 1399, 1391, -40, 1583, 1584, 1587, 1588, 307, -180, 1403, + 1406, -55, 1407, 320, 1408, -11, 417, 1590, 328, 48, + 1591, 1595, 1596, 65, -46, -3, 1597, 1203, 1301, 1600, + -81, 1280, 450, 1601, -139, 1603, 1231, 1191, 409, 51, + 1606, 1607, 1608, 1235, 1610, 79, 1519, 1521, 79, -2119, + -2119, -2119, 420, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + 1188, -2119, 1612, 1613, 1614, 1615, 234, 1192, -2119, -2119, + -2119, -2119, -2119, 1618, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + 62, 62, -2119, -2119, -2119, -2119, -2119, 38, 38, 38, + 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, 1199, 1200, -2119, 24, 24, 1198, 1201, 1202, + 1204, 1207, 1209, 1210, 1211, 1212, 1213, 1623, 234, -2119, + -2119, -2119, -2119, 1214, 1624, -2119, -2119, 1215, 1627, 1216, + 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, + 1227, 1629, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, 1228, 1229, 1630, 1232, 1632, -2119, 1233, 1654, 1234, + 1655, -2119, 1236, 1659, 1237, 1662, 1239, 1241, 1242, 1664, + -2119, -2119, -2119, -2119, 1243, 1246, 1247, 1253, 1254, 1255, + 1680, 1257, 1258, 1265, 1266, 1692, 1269, 1695, 1272, 1697, + 1274, 1275, 1277, 1700, 1281, 1702, 1282, 1284, 1285, 1288, + 1703, 1290, 1704, 1291, 1295, 1724, 1302, 1303, 1304, 1309, + 1310, 1315, 1319, 1320, 1322, 1725, -2119, 1323, 1325, 1330, + 1336, 1740, 1337, 1342, 1343, 1344, 1345, 1346, 1351, 1352, + 1353, 1354, 1356, 1357, 1358, 1361, 1362, 1364, 1365, 1366, + 1741, -2119, -2119, -2119, 1367, 1369, 1371, 1372, 1373, 1374, + 1376, 1742, 1377, 1378, 1381, 1748, 1382, 1383, 1750, -2119, + 1384, 1759, 1385, 1803, -2119, 1386, 1390, 1804, 1393, 1811, + 1400, 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1394, + 1418, 1419, 1420, 1816, -2119, 1421, 1422, 1819, -2119, 1423, + 1820, 1424, 1821, 1425, 1426, 1427, 1428, 1828, 1430, 1431, + 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1440, 1441, 1442, + 1523, 1829, -2119, -2119, -2119, 1524, 1830, -2119, -2119, 1525, + 1529, -2119, 79, -2119, 420, -2119, -2119, -2119, -2119, -2119, + 1831, 1530, -2119, 152, 152, 152, 152, -2119, -2119, 663, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, 49, 1532, 1533, -2119, -2119, 1534, 171, + 171, 76, 1537, 171, 171, 171, 171, 171, -2119, -2119, + 1538, -2119, 20, -2119, 171, 171, 171, 171, 171, 171, + 29, -22, 171, -138, -76, 171, -2119, 1540, 321, -2119, + 40, -2119, 1541, -2119, 1542, -2119, -23, -2119, 171, -2119, + 102, 171, 171, -2119, 171, 269, 1543, 171, 171, 171, + -2119, 171, 171, 171, 171, -2119, 105, -2119, 238, -2119, + 171, 171, 171, -2119, -226, -2119, 171, 171, 171, 171, + -2119, 1544, -2119, 60, 220, -2119, 171, 352, 1545, 1546, + -7, 71, 171, 171, 171, -2119, 171, 171, 171, 171, + -2119, 496, 1547, 171, 171, 171, 171, 1548, 1550, 1552, + 1553, 415, 171, 171, 171, 171, 1554, 1555, 1556, -2119, + 171, 1557, 1559, 1560, 171, 171, 1561, -2119, 171, 1562, + -87, -2119, 1565, 171, -2119, 171, -2119, 1578, -2119, 1580, + 171, -2119, 365, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, 171, 171, 1569, 171, -2119, 309, 1582, + -2119, 1585, -2119, 171, -2119, 171, 171, 171, 171, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, 1586, -2119, 1589, 1592, -2119, -2119, + 961, -54, -54, -54, -54, -2119, 1593, 1298, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, 1594, 1598, 1599, 1602, + 1604, 1605, 1609, 1611, 1616, 1617, 1619, 1620, 1621, 1622, + 1625, 1626, 1628, 1631, 1633, 1634, 1635, 1636, 1637, 1638, + 1639, 1640, 1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, + 1649, 1650, 1651, 1652, 1653, 1656, 1657, 1658, 1660, 1661, + 1663, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, + 1674, 1675, 1676, 1677, 1678, 1679, 1681, 1682, 1683, 1684, + 1685, 1686, 1687, 1688, 1689, 1690, 1691, 1693, 1694, 1696, + 1698, 1699, 1701, 1705, 1706, 1707, 1708, 1709, 1710, 1711, + 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1723, + 1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, 1735, + 1736, 1737, 1738, 1739, 1743, 1744, 1745, 1746, 1747, 1749, + 1751, 1752, 1753, 1754, 1755, 1756, 1757, 1758, 1760, 1761, + 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, 1770, 1771, + 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, + 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789, 1790, 1791, + 1792, 1793, 1794, 1795, 1796, 1797, 1798, 1799, 1800, 1801, + 1802, 1805, 1806, 1807, 1808, 1809, 1810, 1812, 1813, 1814, + 450, 450, 450, 450, 450, 450, 450, 450, 450, 1815, + 1817, 1818, 1822, 1823, 1824, 1825, 1826, 1827, 1832, 1833, + 1834, 1835, 1836, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 1837, 1838, 1839, -2119, + -2119, -2119, -2119, -2119, -54, 1840, -2119, 49, 49, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, 1842, -2119, -2119, -74, -74, -74, -74, + -74, -74, -74, -74, -74, -74, -74, -74, -74, -74, + 1395, 1398, 1398, 1398, 440, 440, 440, 440, 440, 440, + 440, 440, 440, 440, 440, 440, 440, 440, 440, 440, + 440, 440, 440, 440, 17, 17, 17, 17, 17, 1392, + 1392, 1392, 1392, 1387, 1389, 1399, 1399, 1391, -40, -40, + -40, -40, -40, -40, 307, 307, 307, 307, 307, 307, + 307, 307, 307, 307, -180, -180, -180, -180, 1403, 1403, + 1403, 1403, 1406, 1406, -55, -55, -55, 1407, 1407, 1407, + 320, 320, 320, 320, 1408, -11, -11, -11, -11, -11, + -11, -11, -11, -11, -11, -11, -11, -11, 417, 417, + 417, 417, 417, 417, 417, 417, 417, 417, 417, 417, + 417, 417, 417, 328, 328, 328, 328, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 65, 65, 65, 65, + 65, 65, 65, -46, -46, -46, -46, -3, -3, 1203, + 1301, -81, -81, 1280, 1280, 1280, 1280, 1280, 1280, 1280, + 450, 450, 450, 450, -139, -139, -139, -139, 1231, 1191, + 409, 409, 409, 409, 1235, 1105, 1105, 234, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 1862, + 1866, 1841, 1867, -2119, 1843, -2119, 46, 1844, -54, -2119, + 1845, -2119, -2119, 1105, -2119, 1868, -2119, 46, -2119 }; -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint16 yydefact[] = { 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, @@ -2807,101 +2335,102 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 419, 513, 514, - 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, - 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, - 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, - 545, 546, 547, 548, 549, 550, 551, 576, 552, 553, - 554, 555, 556, 557, 558, 559, 560, 561, 562, 574, - 563, 564, 565, 566, 567, 568, 569, 570, 577, 571, - 572, 573, 575, 578, 579, 580, 581, 0, 0, 0, - 0, 436, 277, 279, 0, 283, 0, 275, 335, 337, - 341, 345, 339, 0, 0, 398, 401, 404, 407, 0, - 413, 389, 347, 349, 351, 354, 356, 331, 389, 373, - 369, 371, 375, 0, 0, 0, 0, 367, 379, 377, - 381, 383, 385, 387, 321, 329, 324, 425, 0, 0, - 423, 0, 106, 108, 110, 112, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 116, 118, 90, 92, 94, 96, 302, 304, 306, 308, - 310, 312, 314, 316, 185, 188, 191, 194, 196, 198, - 208, 210, 202, 200, 206, 204, 214, 212, 218, 216, - 220, 224, 226, 228, 0, 0, 0, 235, 0, 0, - 248, 450, 450, 582, 420, 613, 615, 617, 619, 621, - 626, 628, 630, 639, 680, 682, 684, 686, 688, 690, - 692, 694, 696, 698, 711, 722, 724, 729, 734, 736, - 743, 748, 763, 765, 767, 769, 771, 794, 805, 816, - 823, 832, 841, 863, 868, 897, 930, 932, 943, 1004, - 1006, 1008, 1010, 1027, 1043, 1050, 1052, 1057, 1062, 1064, - 1071, 1082, 1140, 1142, 1153, 1038, 1155, 852, 1111, 1160, - 1162, 1164, 1166, 445, 417, 289, 294, 448, 0, 288, - 288, 286, 288, 0, 389, 389, 389, 389, 389, 0, - 389, 419, 419, 419, 419, 410, 0, 353, 389, 389, - 389, 389, 389, 389, 358, 389, 389, 389, 389, 0, - 0, 0, 0, 389, 389, 389, 389, 389, 389, 389, - 433, 428, 431, 0, 120, 120, 120, 120, 121, 123, - 125, 127, 129, 131, 133, 135, 137, 139, 141, 143, - 145, 120, 120, 120, 318, 318, 318, 318, 318, 318, - 318, 318, 0, 0, 0, 237, 251, 249, 247, 439, - 441, 612, 0, 0, 0, 0, 0, 625, 0, 0, - 638, 679, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 710, 721, 0, 728, 733, 0, 742, 747, 762, - 0, 0, 0, 0, 793, 804, 815, 822, 831, 840, - 851, 867, 896, 929, 0, 942, 1003, 0, 0, 0, - 1026, 1037, 1049, 0, 1056, 1061, 0, 1070, 1081, 1110, - 0, 1152, 0, 1042, 1159, 862, 1139, 0, 0, 0, - 1170, 450, 0, 0, 450, 442, 278, 280, 288, 284, - 281, 336, 338, 342, 346, 340, 0, 344, 0, 0, - 0, 0, 419, 0, 348, 350, 352, 355, 357, 0, - 374, 370, 372, 376, 359, 361, 363, 365, 368, 380, - 378, 382, 384, 386, 388, 426, 433, 433, 98, 107, - 109, 111, 113, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 115, 117, 119, 303, - 305, 307, 309, 311, 313, 315, 317, 242, 0, 0, - 236, 253, 253, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 419, 614, 616, 618, 620, 0, - 0, 627, 629, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 681, 683, 685, - 687, 689, 691, 693, 695, 697, 0, 0, 0, 0, - 0, 723, 0, 0, 0, 0, 735, 0, 0, 0, - 0, 0, 0, 0, 0, 764, 766, 768, 770, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 931, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1005, 1007, 1009, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1051, 0, 0, 0, 0, 1063, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1141, - 0, 0, 0, 1154, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1161, 1163, 1165, - 0, 0, 446, 0, 0, 449, 450, 287, 288, 390, - 399, 402, 405, 408, 0, 0, 332, 389, 389, 389, - 389, 429, 432, 100, 122, 124, 126, 128, 130, 132, - 134, 136, 138, 140, 142, 144, 146, 244, 0, 0, - 252, 250, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 583, 418, 0, 622, 0, 631, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 640, - 0, 0, 699, 0, 712, 0, 725, 0, 730, 0, - 737, 0, 744, 0, 0, 0, 749, 0, 0, 0, - 0, 0, 0, 772, 0, 0, 0, 0, 795, 0, - 806, 0, 817, 0, 0, 0, 824, 0, 833, 0, - 0, 0, 0, 842, 0, 864, 0, 0, 869, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 898, 0, - 0, 0, 0, 933, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 944, 0, 0, 0, 0, 0, 0, 0, - 1011, 0, 0, 0, 1028, 0, 0, 1044, 0, 1053, - 0, 1058, 0, 0, 1065, 0, 1072, 1084, 1086, 1088, - 1090, 1092, 1094, 1096, 1098, 1100, 0, 0, 0, 0, - 1083, 0, 0, 1143, 0, 1039, 0, 1156, 0, 0, - 0, 0, 853, 1113, 1115, 1117, 1119, 1121, 1123, 1125, - 1127, 1129, 1131, 1133, 1135, 1137, 1112, 0, 1167, 0, - 0, 443, 282, 392, 416, 416, 416, 416, 411, 0, - 334, 360, 362, 364, 366, 99, 243, 238, 240, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 419, 513, + 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, + 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, + 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, + 544, 545, 546, 547, 548, 549, 550, 551, 576, 552, + 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, + 574, 563, 564, 565, 566, 567, 568, 569, 570, 577, + 571, 572, 573, 575, 578, 579, 580, 581, 582, 0, + 0, 0, 0, 436, 277, 279, 0, 283, 0, 275, + 335, 337, 341, 345, 339, 0, 0, 398, 401, 404, + 407, 0, 413, 389, 347, 349, 351, 354, 356, 331, + 389, 373, 369, 371, 375, 0, 0, 0, 0, 367, + 379, 377, 381, 383, 385, 387, 321, 329, 324, 425, + 0, 0, 423, 0, 106, 108, 110, 112, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 116, 118, 90, 92, 94, 96, 302, 304, + 306, 308, 310, 312, 314, 316, 185, 188, 191, 194, + 196, 198, 208, 210, 202, 200, 206, 204, 214, 212, + 218, 216, 220, 224, 226, 228, 0, 0, 0, 235, + 0, 0, 248, 450, 450, 583, 420, 614, 616, 618, + 620, 622, 627, 629, 631, 640, 683, 685, 687, 689, + 691, 693, 695, 697, 699, 701, 714, 725, 727, 732, + 737, 739, 746, 751, 766, 768, 770, 772, 774, 797, + 808, 819, 826, 835, 844, 866, 871, 900, 933, 935, + 946, 1007, 1009, 1011, 1013, 1030, 1046, 1053, 1055, 1060, + 1065, 1067, 1074, 1091, 1149, 1151, 1162, 1041, 1164, 855, + 1120, 1169, 1171, 1173, 1175, 1180, 445, 417, 289, 294, + 448, 0, 288, 288, 286, 288, 0, 389, 389, 389, + 389, 389, 0, 389, 419, 419, 419, 419, 410, 0, + 353, 389, 389, 389, 389, 389, 389, 358, 389, 389, + 389, 389, 0, 0, 0, 0, 389, 389, 389, 389, + 389, 389, 389, 433, 428, 431, 0, 120, 120, 120, + 120, 121, 123, 125, 127, 129, 131, 133, 135, 137, + 139, 141, 143, 145, 120, 120, 120, 318, 318, 318, + 318, 318, 318, 318, 318, 0, 0, 0, 237, 251, + 249, 247, 439, 441, 613, 0, 0, 0, 0, 0, + 626, 0, 0, 639, 682, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 713, 724, 0, 731, 736, 0, + 745, 750, 765, 0, 0, 0, 0, 796, 807, 818, + 825, 834, 843, 854, 870, 899, 932, 0, 945, 1006, + 0, 0, 0, 1029, 1040, 1052, 0, 1059, 1064, 0, + 1073, 1090, 1119, 0, 1161, 0, 1045, 1168, 865, 1148, + 0, 0, 0, 1179, 0, 450, 0, 0, 450, 442, + 278, 280, 288, 284, 281, 336, 338, 342, 346, 340, + 0, 344, 0, 0, 0, 0, 419, 0, 348, 350, + 352, 355, 357, 0, 374, 370, 372, 376, 359, 361, + 363, 365, 368, 380, 378, 382, 384, 386, 388, 426, + 433, 433, 98, 107, 109, 111, 113, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 115, 117, 119, 303, 305, 307, 309, 311, 313, 315, + 317, 242, 0, 0, 236, 253, 253, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 419, 615, + 617, 619, 621, 0, 0, 628, 630, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 684, 686, 688, 690, 692, 694, 696, 698, + 700, 0, 0, 0, 0, 0, 726, 0, 0, 0, + 0, 738, 0, 0, 0, 0, 0, 0, 0, 0, + 767, 769, 771, 773, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 934, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1008, 1010, 1012, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1054, + 0, 0, 0, 0, 1066, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1150, 0, 0, 0, 1163, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1170, 1172, 1174, 0, 0, 1181, 446, 0, + 0, 449, 450, 287, 288, 390, 399, 402, 405, 408, + 0, 0, 332, 389, 389, 389, 389, 429, 432, 100, + 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, + 142, 144, 146, 244, 0, 0, 252, 250, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 584, 418, + 0, 623, 0, 632, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 641, 0, 0, 702, + 0, 715, 0, 728, 0, 733, 0, 740, 0, 747, + 0, 0, 0, 752, 0, 0, 0, 0, 0, 0, + 775, 0, 0, 0, 0, 798, 0, 809, 0, 820, + 0, 0, 0, 827, 0, 836, 0, 0, 0, 0, + 845, 0, 867, 0, 0, 872, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 901, 0, 0, 0, 0, + 936, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 947, + 0, 0, 0, 0, 0, 0, 0, 1014, 0, 0, + 0, 1031, 0, 0, 1047, 0, 1056, 0, 1061, 0, + 0, 1068, 0, 1075, 1093, 1095, 1097, 1099, 1101, 1103, + 1105, 1107, 1109, 0, 0, 0, 0, 1092, 0, 0, + 1152, 0, 1042, 0, 1165, 0, 0, 0, 0, 856, + 1122, 1124, 1126, 1128, 1130, 1132, 1134, 1136, 1138, 1140, + 1142, 1144, 1146, 1121, 0, 1176, 0, 0, 443, 282, + 392, 416, 416, 416, 416, 411, 0, 334, 360, 362, + 364, 366, 99, 243, 238, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2918,76 +2447,150 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1110, - 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, - 1139, 1139, 1139, 1139, 1139, 0, 0, 0, 391, 400, - 403, 406, 409, 416, 0, 333, 244, 244, 584, 586, - 588, 590, 598, 592, 594, 596, 600, 602, 604, 606, - 608, 610, 623, 632, 634, 636, 641, 643, 645, 647, - 649, 651, 657, 653, 655, 659, 661, 663, 669, 665, - 667, 673, 675, 677, 671, 700, 702, 704, 706, 708, - 713, 715, 717, 719, 726, 731, 738, 740, 745, 750, - 752, 754, 756, 758, 760, 785, 773, 781, 775, 777, - 779, 783, 789, 787, 791, 796, 798, 800, 802, 807, - 809, 811, 813, 818, 820, 825, 829, 827, 834, 836, - 838, 847, 849, 843, 845, 865, 870, 872, 880, 888, - 882, 876, 874, 878, 884, 886, 890, 892, 894, 899, - 901, 903, 905, 907, 909, 911, 913, 915, 917, 921, - 919, 923, 925, 927, 938, 940, 934, 936, 945, 947, - 949, 951, 953, 955, 957, 959, 961, 963, 975, 965, - 967, 969, 971, 973, 977, 979, 981, 983, 985, 987, - 989, 991, 993, 995, 997, 999, 1001, 1012, 1014, 1016, - 1018, 1020, 1022, 1024, 1029, 1031, 1033, 1035, 1045, 1047, - 1054, 1059, 1068, 1066, 1073, 1075, 1077, 1079, 1085, 1087, - 1089, 1091, 1093, 1095, 1097, 1099, 1101, 1102, 1104, 1106, - 1108, 1144, 1146, 1148, 1150, 1040, 1157, 858, 860, 854, - 856, 1114, 1116, 1118, 1120, 1122, 1124, 1126, 1128, 1130, - 1132, 1134, 1136, 1138, 1168, 290, 295, 412, 0, 239, - 241, 612, 612, 612, 612, 612, 612, 612, 612, 612, - 612, 612, 612, 612, 612, 625, 638, 638, 638, 679, - 679, 679, 679, 679, 679, 679, 679, 679, 679, 679, - 679, 679, 679, 679, 679, 679, 679, 679, 710, 710, - 710, 710, 710, 721, 721, 721, 721, 728, 733, 742, - 742, 747, 762, 762, 762, 762, 762, 762, 793, 793, - 793, 793, 793, 793, 793, 793, 793, 793, 804, 804, - 804, 804, 815, 815, 815, 815, 822, 822, 831, 831, - 831, 840, 840, 840, 851, 851, 851, 851, 867, 896, - 896, 896, 896, 896, 896, 896, 896, 896, 896, 896, - 896, 896, 929, 929, 929, 929, 929, 929, 929, 929, - 929, 929, 929, 929, 929, 929, 929, 942, 942, 942, - 942, 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1003, - 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1003, - 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1003, - 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1037, 1037, 1037, - 1037, 1049, 1049, 1056, 1061, 1070, 1070, 1081, 1081, 1081, - 1081, 1110, 1110, 1110, 1110, 1152, 1152, 1152, 1152, 1042, - 1159, 862, 862, 862, 862, 1170, 318, 318, 419, 585, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1148, 1148, 1148, 1148, 1148, 1148, 1148, + 1148, 1148, 1148, 1148, 1148, 1148, 0, 0, 0, 391, + 400, 403, 406, 409, 416, 0, 333, 244, 244, 585, 587, 589, 591, 599, 593, 595, 597, 601, 603, 605, 607, 609, 611, 624, 633, 635, 637, 642, 644, 646, 648, 650, 652, 658, 654, 656, 660, 662, 664, 670, - 666, 668, 674, 676, 678, 672, 701, 703, 705, 707, - 709, 714, 716, 718, 720, 727, 732, 739, 741, 746, - 751, 753, 755, 757, 759, 761, 786, 774, 782, 776, - 778, 780, 784, 790, 788, 792, 797, 799, 801, 803, - 808, 810, 812, 814, 819, 821, 826, 830, 828, 835, - 837, 839, 848, 850, 844, 846, 866, 871, 873, 881, - 889, 883, 877, 875, 879, 885, 887, 891, 893, 895, - 900, 902, 904, 906, 908, 910, 912, 914, 916, 918, - 922, 920, 924, 926, 928, 939, 941, 935, 937, 946, - 948, 950, 952, 954, 956, 958, 960, 962, 964, 976, - 966, 968, 970, 972, 974, 978, 980, 982, 984, 986, - 988, 990, 992, 994, 996, 998, 1000, 1002, 1013, 1015, - 1017, 1019, 1021, 1023, 1025, 1030, 1032, 1034, 1036, 1046, - 1048, 1055, 1060, 1069, 1067, 1074, 1076, 1078, 1080, 1103, - 1105, 1107, 1109, 1145, 1147, 1149, 1151, 1041, 1158, 859, - 861, 855, 857, 1169, 291, 296, 0, 0, 0, 0, - 292, 0, 414, 301, 0, 416, 293, 0, 415, 297, - 318, 298, 0, 299, 301, 300 + 666, 668, 674, 676, 678, 672, 680, 703, 705, 707, + 709, 711, 716, 718, 720, 722, 729, 734, 741, 743, + 748, 753, 755, 757, 759, 761, 763, 788, 776, 784, + 778, 780, 782, 786, 792, 790, 794, 799, 801, 803, + 805, 810, 812, 814, 816, 821, 823, 828, 832, 830, + 837, 839, 841, 850, 852, 846, 848, 868, 873, 875, + 883, 891, 885, 879, 877, 881, 887, 889, 893, 895, + 897, 902, 904, 906, 908, 910, 912, 914, 916, 918, + 920, 924, 922, 926, 928, 930, 941, 943, 937, 939, + 948, 950, 952, 954, 956, 958, 960, 962, 964, 966, + 978, 968, 970, 972, 974, 976, 980, 982, 984, 986, + 988, 990, 992, 994, 996, 998, 1000, 1002, 1004, 1015, + 1017, 1019, 1021, 1023, 1025, 1027, 1032, 1034, 1036, 1038, + 1048, 1050, 1057, 1062, 1071, 1069, 1076, 1078, 1080, 1082, + 1084, 1086, 1088, 1094, 1096, 1098, 1100, 1102, 1104, 1106, + 1108, 1110, 1111, 1113, 1115, 1117, 1153, 1155, 1157, 1159, + 1043, 1166, 861, 863, 857, 859, 1123, 1125, 1127, 1129, + 1131, 1133, 1135, 1137, 1139, 1141, 1143, 1145, 1147, 1177, + 290, 295, 412, 0, 239, 241, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 626, 639, 639, 639, 682, 682, 682, 682, 682, 682, + 682, 682, 682, 682, 682, 682, 682, 682, 682, 682, + 682, 682, 682, 682, 713, 713, 713, 713, 713, 724, + 724, 724, 724, 731, 736, 745, 745, 750, 765, 765, + 765, 765, 765, 765, 796, 796, 796, 796, 796, 796, + 796, 796, 796, 796, 807, 807, 807, 807, 818, 818, + 818, 818, 825, 825, 834, 834, 834, 843, 843, 843, + 854, 854, 854, 854, 870, 899, 899, 899, 899, 899, + 899, 899, 899, 899, 899, 899, 899, 899, 932, 932, + 932, 932, 932, 932, 932, 932, 932, 932, 932, 932, + 932, 932, 932, 945, 945, 945, 945, 1006, 1006, 1006, + 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, + 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, + 1006, 1006, 1006, 1006, 1006, 1006, 1029, 1029, 1029, 1029, + 1029, 1029, 1029, 1040, 1040, 1040, 1040, 1052, 1052, 1059, + 1064, 1073, 1073, 1090, 1090, 1090, 1090, 1090, 1090, 1090, + 1119, 1119, 1119, 1119, 1161, 1161, 1161, 1161, 1045, 1168, + 865, 865, 865, 865, 1179, 318, 318, 419, 586, 588, + 590, 592, 600, 594, 596, 598, 602, 604, 606, 608, + 610, 612, 625, 634, 636, 638, 643, 645, 647, 649, + 651, 653, 659, 655, 657, 661, 663, 665, 671, 667, + 669, 675, 677, 679, 673, 681, 704, 706, 708, 710, + 712, 717, 719, 721, 723, 730, 735, 742, 744, 749, + 754, 756, 758, 760, 762, 764, 789, 777, 785, 779, + 781, 783, 787, 793, 791, 795, 800, 802, 804, 806, + 811, 813, 815, 817, 822, 824, 829, 833, 831, 838, + 840, 842, 851, 853, 847, 849, 869, 874, 876, 884, + 892, 886, 880, 878, 882, 888, 890, 894, 896, 898, + 903, 905, 907, 909, 911, 913, 915, 917, 919, 921, + 925, 923, 927, 929, 931, 942, 944, 938, 940, 949, + 951, 953, 955, 957, 959, 961, 963, 965, 967, 979, + 969, 971, 973, 975, 977, 981, 983, 985, 987, 989, + 991, 993, 995, 997, 999, 1001, 1003, 1005, 1016, 1018, + 1020, 1022, 1024, 1026, 1028, 1033, 1035, 1037, 1039, 1049, + 1051, 1058, 1063, 1072, 1070, 1077, 1079, 1081, 1083, 1085, + 1087, 1089, 1112, 1114, 1116, 1118, 1154, 1156, 1158, 1160, + 1044, 1167, 862, 864, 858, 860, 1178, 291, 296, 0, + 0, 0, 0, 292, 0, 414, 301, 0, 416, 293, + 0, 415, 297, 318, 298, 0, 299, 301, 300 +}; + + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int16 yypgoto[] = +{ + -2119, -2119, -2119, -2119, 376, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, 1536, -2119, 1306, + -2119, 388, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -343, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, 87, -2119, -346, -2119, -2119, -397, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -579, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, 121, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -369, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -468, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, 516, -2119, -2119, -1742, -2119, -2119, + -2119, 681, -2119, -2119, -1109, -2119, -2119, 340, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, 1057, -2119, -2119, + -1266, -2119, -2119, -2119, -2119, -2119, -2119, -814, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -447, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -555, -2119, -2119, + -2119, -2119, -2119, 1018, -2119, -82, -2119, -2119, -1100, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -73, -2119, -2119, -1942, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -861, -2119, 1019, -2119, -2119, -1210, -2119, -2119, -2119, + -2119, -2119, 1067, -2119, -2119, -1189, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, 468, -2119, -2119, -2119, -2119, -2119, -2119, + 461, -2119, -2119, -2119, -2119, -2119, -2119, 114, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, 441, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -97, -2119, -2119, -2119, -1530, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -542, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -1693, -2119, -2119, -2119, -2119, -2119, -1669, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -1602, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -1873, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -572, -2119, -2119, -2119, + -570, -2119, -2119, -2119, -2119, -2119, -2045, -2119, -2119, -2119, + -2119, -575, -2119, -2119, -2119, -1432, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -1647, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -1878, -2119, -2119, -2119, -2119, + -2119, -2119, -1848, -2119, -2119, -2119, -2119, -2119, -2119, -2067, + -2119, -2119, -2119, -2119, -1735, -2119, -2119, -2119, -2119, -2119, + -1695, -2119, -2119, -2119, -2119, -2119, -1748, -2119, -2119, -2119, + -2119, -2119, -2119, -1733, -2119, -2119, -2119, -2119, -2119, -2119, + -609, -2119, -2119, -2119, -1561, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -1706, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -1491, -2119, -2119, -2119, -2119, -2119, -2119, -1577, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -1556, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -1527, -2119, -2119, -2119, -2119, + -2119, -2119, -701, -2119, -2119, -2119, -2118, -2119, -2119, -2119, + -2119, -2119, -2119, -681, -2119, -2119, -2119, -680, -2119, -2119, + -2119, -2119, -2119, -2084, -2119, -2119, -2119, -2119, -1566, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2111, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -1184, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -2119, -1544, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -700, -2119, -2119, -2119, -2119, -2119, -2119, -2119, -2119, + -2119, -703, -2119, -2119, -2119 }; -/* YYDEFGOTO[NTERM-NUM]. */ + /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 1, 2, 11, 24, 56, 233, 63, 372, 64, @@ -2995,660 +2598,304 @@ 567, 55, 401, 407, 408, 409, 410, 411, 412, 413, 167, 187, 450, 461, 464, 462, 463, 313, 598, 599, 600, 601, 602, 603, 604, 605, 606, 889, 890, 891, - 892, 282, 1743, 170, 283, 284, 578, 1324, 1325, 1326, - 1327, 873, 1342, 1343, 1159, 1483, 1484, 1485, 1486, 1487, - 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 186, 742, + 892, 282, 1749, 170, 283, 284, 578, 1327, 1328, 1329, + 1330, 873, 1345, 1346, 1161, 1487, 1488, 1489, 1490, 1491, + 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, 186, 742, 743, 744, 745, 751, 749, 746, 747, 748, 752, 750, 196, 766, 767, 768, 769, 770, 771, 446, 907, 447, 908, 448, 909, 127, 919, 920, 921, 925, 924, 927, 926, 922, 923, 929, 928, 931, 930, 932, 649, 933, - 934, 935, 356, 804, 484, 803, 1355, 939, 2176, 2177, - 1757, 358, 656, 1200, 807, 1512, 1511, 61, 488, 489, + 934, 935, 356, 804, 484, 803, 1358, 939, 2187, 2188, + 1763, 358, 656, 1202, 807, 1516, 1515, 61, 488, 489, 491, 490, 492, 494, 493, 496, 495, 136, 371, 819, - 509, 1279, 1280, 1728, 1282, 816, 1438, 1089, 1432, 2576, - 2767, 2773, 1433, 2577, 2768, 2780, 2782, 2784, 619, 1344, - 1345, 1346, 1347, 1348, 1349, 1350, 1351, 140, 373, 860, - 374, 862, 707, 538, 861, 844, 1303, 1950, 536, 1284, - 1285, 1288, 1286, 830, 1287, 1298, 1299, 1300, 1301, 1302, - 1737, 1738, 1739, 1740, 1313, 1306, 1307, 1305, 1308, 1315, - 1314, 1316, 1317, 1318, 1319, 1104, 1943, 825, 837, 1291, - 1944, 1292, 1945, 1293, 1946, 1294, 1947, 1452, 2173, 1296, - 2775, 1016, 1362, 142, 377, 867, 544, 1320, 865, 1476, - 866, 1477, 134, 369, 813, 502, 1201, 1202, 1726, 810, - 1431, 811, 1434, 72, 546, 547, 548, 549, 550, 551, + 509, 1282, 1283, 1734, 1285, 816, 1442, 1091, 1436, 2595, + 2790, 2796, 1437, 2596, 2791, 2803, 2805, 2807, 619, 1347, + 1348, 1349, 1350, 1351, 1352, 1353, 1354, 140, 373, 860, + 374, 862, 707, 538, 861, 844, 1306, 1957, 536, 1287, + 1288, 1291, 1289, 830, 1290, 1301, 1302, 1303, 1304, 1305, + 1743, 1744, 1745, 1746, 1316, 1309, 1310, 1308, 1311, 1318, + 1317, 1319, 1320, 1321, 1322, 1106, 1950, 825, 837, 1294, + 1951, 1295, 1952, 1296, 1953, 1297, 1954, 1456, 2184, 1299, + 2798, 1017, 1365, 142, 377, 867, 544, 1323, 865, 1480, + 866, 1481, 134, 369, 813, 502, 1203, 1204, 1732, 810, + 1435, 811, 1438, 72, 546, 547, 548, 549, 550, 551, 84, 559, 560, 561, 562, 563, 564, 207, 776, 777, 782, 783, 778, 779, 780, 781, 784, 77, 553, 552, - 554, 555, 556, 557, 558, 179, 1017, 1018, 1361, 1523, - 2391, 2392, 2393, 2394, 2396, 2397, 2398, 2395, 2399, 2400, - 2401, 2402, 2403, 2404, 1019, 1363, 1020, 1364, 1021, 1365, - 1022, 1366, 1023, 1367, 1530, 2405, 1024, 1368, 1025, 1369, - 1026, 1370, 1534, 2406, 2407, 2408, 1027, 1371, 1546, 2409, - 2410, 2411, 2412, 2413, 2414, 2416, 2417, 2415, 2418, 2419, - 2420, 2422, 2423, 2421, 2427, 2424, 2425, 2426, 1028, 1372, - 1029, 1373, 1030, 1374, 1031, 1375, 1032, 1376, 1033, 1377, - 1034, 1378, 1035, 1379, 1036, 1380, 1037, 1381, 1558, 2428, - 2429, 2430, 2431, 2432, 1038, 1382, 1560, 2433, 2434, 2435, - 2436, 1039, 1383, 1040, 1384, 1563, 2437, 1041, 1385, 1565, - 2438, 1042, 1386, 1043, 1387, 1568, 2439, 2440, 1044, 1388, - 1570, 2441, 1045, 1389, 1574, 2442, 2443, 2444, 2445, 2446, - 2447, 1046, 1390, 1047, 1391, 1048, 1392, 1049, 1393, 1050, - 1394, 1585, 2449, 2451, 2452, 2453, 2450, 2454, 2448, 2456, - 2455, 2457, 1051, 1395, 1590, 2458, 2459, 2460, 2461, 1052, - 1396, 1592, 2462, 2463, 2464, 2465, 1053, 1397, 1594, 2466, - 2467, 1054, 1398, 1598, 2468, 2470, 2469, 1055, 1399, 1600, - 2471, 2472, 2473, 1056, 1400, 1605, 2476, 2477, 2474, 2475, - 1057, 1425, 1702, 2573, 2574, 2571, 2572, 1058, 1401, 1607, - 2478, 1059, 1402, 1610, 2479, 2480, 2485, 2484, 2486, 2481, - 2483, 2487, 2488, 2482, 2489, 2490, 2491, 1060, 1403, 1620, - 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, - 2503, 2502, 2504, 2505, 2506, 1061, 1404, 1062, 1405, 1626, - 2509, 2510, 2507, 2508, 1063, 1406, 1645, 2511, 2512, 2513, - 2514, 2515, 2516, 2517, 2518, 2519, 2520, 2522, 2523, 2524, - 2525, 2526, 2521, 2527, 2528, 2529, 2530, 2531, 2532, 2533, - 2534, 2535, 2536, 2537, 2538, 2539, 1064, 1407, 1065, 1408, - 1066, 1409, 1067, 1410, 1656, 2540, 2541, 2542, 2543, 2544, - 2545, 2546, 1068, 1411, 1660, 2547, 2548, 2549, 2550, 1069, - 1423, 1695, 2569, 1070, 1412, 1663, 2551, 2552, 1071, 1413, - 1072, 1414, 1666, 2553, 1073, 1415, 1668, 2554, 1074, 1416, - 1075, 1417, 1672, 2556, 2555, 1076, 1418, 1674, 2557, 2558, - 2559, 2560, 1077, 1419, 1688, 2129, 2130, 2131, 2132, 2133, - 2134, 2135, 2136, 2137, 2561, 2562, 2563, 2564, 1078, 1426, - 1716, 2152, 2153, 2154, 2155, 2156, 2157, 2158, 2159, 2160, - 2161, 2162, 2163, 2164, 1079, 1420, 1080, 1421, 1692, 2565, - 2566, 2567, 2568, 1081, 1422, 1082, 1424, 1697, 2570, 1083, - 1427, 1084, 1428, 1085, 1429, 1086, 1430, 1721, 2575 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -2094 -static const yytype_int16 yypact[] = -{ - -2094, 62, -91, -2094, -339, -335, -266, -265, -244, -242, - -2094, 23, 198, 223, 227, 234, 238, 252, 256, 309, - 313, 324, 337, 340, -2094, 117, -2094, 13, -2094, -2094, - -2094, -2094, 660, 279, 770, -2094, -168, -174, 351, 356, - -114, -62, -50, -29, -21, 1, 368, 438, 441, 77, - 463, 103, 105, 149, 160, 504, 85, 169, 171, 179, - 184, 636, 659, 772, 42, 753, 425, 427, 465, 473, - 499, 505, 882, 529, 541, 542, 546, 967, 589, 590, - 591, 592, 593, 594, 1014, 600, 597, 1017, 603, -2094, - 277, 604, 605, 606, 284, 608, 312, 388, -2094, 327, - 312, 259, 312, 312, 312, 611, 23, 607, 609, 610, - 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, - 622, 623, 624, 625, 626, 1025, 1026, -2094, 631, 632, - -135, -152, 23, 1028, 1030, 1049, 1050, 1052, 1053, 630, - 1054, 1056, 1057, 638, 641, 643, 644, 645, 646, 23, - 407, 647, 649, 312, 23, 650, 651, 652, 653, 654, - 655, 23, 656, 1062, 312, 23, 657, 661, -2094, -2094, - 1071, 658, 662, 663, 664, 665, 666, -2094, -2094, 667, - 668, 669, 670, 671, 672, 673, 1072, 99, 674, 675, - 676, 677, 678, 1074, 1079, 1080, 1086, 680, 681, 682, - 683, 684, 685, 686, 687, 688, 689, 1099, 691, 692, - 693, 694, -2094, 697, 698, 699, 700, 701, 702, 703, - 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, - 714, -2094, 747, 1132, 715, 716, 717, 718, 719, 720, - 721, 722, 723, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - 312, -2094, -2094, -2094, 724, 725, 726, 727, 728, 729, - -2094, 730, 731, 732, 733, 734, 735, 736, -2094, 737, - 738, 739, 740, 741, 742, -2094, -2094, -2094, 743, -2094, - -2094, 744, 1162, 1165, 1166, 117, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, 22, 82, 312, 312, 751, 752, 117, - 750, 754, 755, 756, 757, 758, 759, 760, 761, 762, - 763, 764, 765, 1169, 769, 771, 773, -52, 774, -2094, - -2094, -2094, 117, -2094, 776, 777, 778, 779, 780, 312, - 781, 782, 783, 117, -2094, -2094, -2094, -2094, 766, 768, - 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, - 794, 797, 796, 798, 799, 800, 1015, 1171, 1180, 23, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 422, - 23, 336, 23, 0, 802, 803, 23, 216, 23, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 600, 23, - -2094, 117, 806, 117, 30, 30, -2094, 117, 117, 117, - 117, 117, 117, 117, 805, 807, 808, 809, 810, 811, - 812, 813, 814, 815, 816, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, 312, 312, 819, 312, 117, - 818, 820, 821, 822, 823, 824, 1098, 1098, 1098, -2094, - 117, 825, 826, 827, 828, 829, 830, 831, 832, 833, - -2094, 117, 117, 117, 117, 836, 837, 838, 839, 840, - 841, 842, 843, 844, 845, 846, 847, 848, -2094, 849, - 850, 851, 852, 1201, 1202, -2094, 85, -2094, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 853, 854, 1204, - 1225, 855, 1237, -2094, 856, 857, 1270, 858, 859, 1271, - -2094, 860, 861, 862, 863, 864, 1285, 1286, 867, 868, - 869, 870, 871, 1292, 873, 874, 875, 876, 877, 878, - 879, 880, 881, 883, 884, 885, 1301, 887, 1306, -2094, - -2094, 888, 1309, 1310, 1311, -2094, 660, 660, 660, 660, - 660, 660, 279, 279, 279, 279, 279, 279, 279, 770, - 770, 770, 770, 770, 770, -2094, -2094, -168, -2094, 890, - -2094, 893, 894, 895, 896, 1317, 898, 899, 1319, 1320, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 99, 99, - 99, 99, 99, 99, 99, 99, 99, 903, 904, 905, - 906, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 907, 1325, - 1327, 1328, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, 911, 912, 913, 914, - 915, 916, 917, 918, 919, 920, 921, 922, 923, 85, - 924, 925, 926, 927, -2094, -2094, 15, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, 930, 932, -2094, - -2094, 933, -2094, 934, 936, -2094, 937, 938, -2094, 509, - 940, 312, 312, 941, -2094, -10, 312, 312, 312, 942, - 312, 1138, 102, 943, 944, 945, 946, 948, 312, 949, - 312, 312, 312, 312, -2094, -2094, -2094, 42, 950, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, 951, 312, 952, 312, 953, -2094, 312, 312, - 277, 277, 388, 388, 388, 388, 388, 388, 388, 388, - 388, 388, 388, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, 327, 327, 327, 327, - 327, 327, 443, -2094, -2094, -2094, 259, 259, 259, 259, - 259, 259, 259, 259, 259, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, 43, 85, 929, 939, 1353, 954, 955, - 556, 52, 956, 659, 957, 959, 52, 960, 961, 772, - -2094, -2094, -2094, -2094, -2094, 962, 964, 965, 966, 968, - 958, 1367, 1371, 1372, 1380, 969, 1388, 1389, 970, 972, - 973, 974, 975, 1395, 1396, 977, 979, 980, 981, 982, - 983, 984, 985, 988, 989, 990, 991, 992, 993, 994, - 42, 802, 42, -2094, 995, 556, 52, 753, 996, 997, - 999, 1000, 1001, 70, 1002, 1003, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 99, - 99, 99, 99, -2094, -2094, -2094, -2094, -2094, -2094, 1004, - 1005, 1006, 1007, 1008, 1009, 1010, 1011, 327, 327, 327, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 1012, 1013, 1016, 1400, - -2094, 986, 998, -2094, -2094, -2094, 1431, 1434, 1435, 1437, - 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445, 1446, 1447, - 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1456, 1457, - 1458, 1459, 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, - 1468, 1469, 1470, 1471, 1472, 1473, 1474, 1475, 1476, 1477, - 1478, 1479, 1480, 1481, 1482, 1483, 1484, 1485, 1486, 1487, - 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, - 1498, 1499, 1500, 1501, 1502, 1503, 1504, 556, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1506, 1507, 1508, - 1087, -2094, -2094, -2094, 1509, -2094, 1091, -2094, -2094, -2094, - -2094, -2094, -2094, 1092, 1510, -2094, -2094, -2094, -2094, 1513, - -2094, 0, -2094, -2094, -2094, -2094, -2094, -2094, 0, -2094, - -2094, -2094, -2094, 1097, 1100, 1101, 1102, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1514, 1515, - -2094, 1103, -2094, -2094, -2094, -2094, 1104, 1105, 1106, 1107, - 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1520, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, 1120, 1121, 1122, -2094, 1118, 1123, - 747, 422, 422, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1124, 336, - 336, -2094, 336, 1125, 0, 0, 0, 0, 0, 1128, - 0, 556, 556, 556, 556, -2094, 1254, -2094, 0, 0, - 0, 0, 0, 0, -2094, 0, 0, 0, 0, 1127, - 1129, 1130, 1131, 0, 0, 0, 0, 0, 0, 0, - 216, -2094, -2094, 1133, 30, 30, 30, 30, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, 30, 30, 30, 1098, 1098, 1098, 1098, 1098, 1098, - 1098, 1098, 1134, 1119, 1126, 1015, -2094, -2094, -2094, -2094, - -2094, 164, 1521, 1540, 1550, 1553, 1554, 1385, 1556, 1557, - 1387, 121, 1559, 1560, 1561, 1562, 1563, 1564, 1565, 1566, - 1567, -17, 1382, 1569, 1377, 1378, 1572, 1390, 1379, -78, - 1573, 1575, 1577, 1578, 61, 114, 1393, 1394, 14, 1397, - 44, 1398, 180, 187, 1581, 314, 56, 1582, 1585, 1586, - 136, -95, 138, 1587, 1196, 1291, 1590, -138, 1269, 317, - 1592, -167, 1593, 1224, 1184, 341, 144, 1596, 1597, 1598, - 1228, 422, 1505, 1511, 422, -2094, -2094, -2094, 336, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, 1182, -2094, 1601, 1602, - 1604, 1605, 556, 1187, -2094, -2094, -2094, -2094, -2094, 1607, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, 216, 216, -2094, -2094, - -2094, -2094, -2094, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1192, 1194, - -2094, 15, 15, 1193, 1195, 1197, 1198, 1199, 1200, 1203, - 1205, 1206, 1207, 1611, 556, -2094, -2094, -2094, -2094, 1208, - 1613, -2094, -2094, 1209, 1615, 1210, 1211, 1212, 1213, 1214, - 1215, 1216, 1217, 1218, 1219, 1220, 1620, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, 1221, 1222, 1621, 1223, - 1623, -2094, 1226, 1643, 1227, 1644, -2094, 1229, 1647, 1230, - 1650, 1232, 1233, 1234, 1654, -2094, -2094, -2094, -2094, 1236, - 1238, 1239, 1240, 1241, 1242, 1656, 1245, 1246, 1252, 1253, - 1673, 1255, 1675, 1257, 1683, 1265, 1267, 1268, 1688, 1272, - 1689, 1273, 1274, 1275, 1276, 1690, 1277, 1697, 1279, 1280, - 1701, 1283, 1288, 1289, 1293, 1299, 1300, 1302, 1307, 1308, - 1705, -2094, 1313, 1314, 1315, 1316, 1720, 1318, 1321, 1322, - 1323, 1324, 1333, 1334, 1335, 1340, 1341, 1342, 1343, 1344, - 1349, 1350, 1351, 1352, 1354, 1725, -2094, -2094, -2094, 1355, - 1356, 1359, 1360, 1362, 1363, 1364, 1736, 1365, 1369, 1370, - 1739, 1374, 1375, 1747, -2094, 1376, 1786, 1381, 1790, -2094, - 1383, 1384, 1791, 1391, 1796, 1386, 1403, 1404, 1405, 1406, - 1407, 1408, 1409, 1410, 1392, 1411, 1412, 1413, 1797, -2094, - 1414, 1415, 1798, -2094, 1416, 1799, 1417, 1801, 1418, 1419, - 1420, 1421, 1807, 1423, 1424, 1425, 1426, 1427, 1428, 1429, - 1430, 1432, 1433, 1436, 1512, 1516, 1809, -2094, -2094, -2094, - 1517, 1812, -2094, 1518, 1519, -2094, 422, -2094, 336, -2094, - -2094, -2094, -2094, -2094, 1813, 1399, -2094, 0, 0, 0, - 0, -2094, -2094, 661, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, 43, 1522, 1523, - -2094, -2094, 1401, 312, 312, 196, 1524, 312, 312, 312, - 312, 312, -2094, -2094, 1526, -2094, 41, -2094, 312, 312, - 312, 312, 312, 312, 89, -4, 312, -154, -292, -2094, - 1528, 329, -2094, 40, -2094, 1529, -2094, 1530, -2094, -11, - -2094, 312, -2094, 71, 312, 312, -2094, 312, 274, 1531, - 312, 312, 312, -2094, 312, 312, 312, 312, -2094, 130, - -2094, 462, -2094, 312, 312, 312, -2094, 8, -2094, 312, - 312, 312, 312, -2094, 1532, -2094, 230, 306, -2094, 312, - 386, 1533, 1534, 246, 158, 312, 312, 312, -2094, 312, - 312, 312, 312, -2094, 271, 1535, 312, 312, 312, 312, - 1536, 1538, 1539, 1541, 353, 312, 312, 312, 312, 1542, - 1543, 1544, -2094, 312, 1545, 1546, 1547, 312, 312, 1548, - -2094, 312, 1549, -108, -2094, 1552, 312, -2094, 312, -2094, - 1555, -2094, 1558, 312, -2094, 212, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, 312, 312, 1568, 312, - -2094, 298, 1570, -2094, 1574, -2094, 312, -2094, 312, 312, - 312, 312, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1576, -2094, 1579, - 1580, -2094, -2094, 958, -10, -10, -10, -10, -2094, 1551, - 1138, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1583, - 1584, 1588, 1589, 1591, 1594, 1595, 1599, 1600, 1603, 1606, - 1608, 1609, 1610, 1612, 1614, 1616, 1617, 1618, 1619, 1622, - 1624, 1625, 1626, 1627, 1628, 1629, 1630, 1631, 1632, 1633, - 1634, 1635, 1636, 1637, 1638, 1639, 1640, 1641, 1642, 1645, - 1646, 1648, 1649, 1651, 1652, 1653, 1655, 1657, 1658, 1659, - 1660, 1661, 1662, 1663, 1664, 1665, 1666, 1667, 1668, 1669, - 1670, 1671, 1672, 1674, 1676, 1677, 1678, 1679, 1680, 1681, - 1682, 1684, 1685, 1686, 1687, 1691, 1692, 1693, 1694, 1695, - 1696, 1698, 1699, 1700, 1702, 1703, 1704, 1706, 1709, 1710, - 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1721, - 1722, 1723, 1724, 1726, 1727, 1728, 1729, 1730, 1731, 1732, - 1733, 1734, 1735, 1737, 1738, 1740, 1741, 1742, 1743, 1744, - 1745, 1746, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, - 1756, 1757, 1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765, - 1766, 1767, 1768, 1769, 1770, 1771, 1772, 1773, 1774, 1775, - 1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, - 1787, 1788, 1789, 1792, 1793, 1794, 1795, 1800, 1802, 317, - 317, 317, 317, 317, 317, 317, 317, 317, 1803, 1804, - 1805, 1806, 1808, 1810, 1811, 1814, 1815, 1816, 1817, 1818, - 1819, 1820, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 1821, 1822, 1823, -2094, -2094, - -2094, -2094, -2094, -10, 1824, -2094, 43, 43, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1830, -2094, - -2094, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 164, 164, 164, 1385, 1387, 1387, 1387, 121, - 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 121, 121, 121, 121, -17, -17, - -17, -17, -17, 1382, 1382, 1382, 1382, 1377, 1378, 1390, - 1390, 1379, -78, -78, -78, -78, -78, -78, 61, 61, - 61, 61, 61, 61, 61, 61, 61, 61, 114, 114, - 114, 114, 1393, 1393, 1393, 1393, 1394, 1394, 14, 14, - 14, 1397, 1397, 1397, 44, 44, 44, 44, 1398, 180, - 180, 180, 180, 180, 180, 180, 180, 180, 180, 180, - 180, 180, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 314, 314, 314, - 314, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 136, 136, 136, 136, 136, 136, 136, -95, -95, -95, - -95, 138, 138, 1196, 1291, -138, -138, 1269, 1269, 1269, - 1269, 317, 317, 317, 317, -167, -167, -167, -167, 1224, - 1184, 341, 341, 341, 341, 1228, 1098, 1098, 556, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, 1849, 1852, 1825, 1853, - -2094, 1571, -2094, 52, 1708, -10, -2094, 1826, -2094, -2094, - 1098, -2094, 1855, -2094, 52, -2094 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = -{ - -2094, -2094, -2094, -2094, 157, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1525, -2094, 1294, - -2094, 315, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -499, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, 119, -2094, -209, -2094, -2094, -401, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -684, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, 79, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -348, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -471, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, 508, -2094, -2094, -1737, -2094, -2094, - -2094, 679, -2094, -2094, -975, -2094, -2094, 133, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, 1041, -2094, -2094, - -1261, -2094, -2094, -2094, -2094, -2094, -2094, -814, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -447, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -677, -2094, -2094, - -2094, -2094, -2094, 1019, -2094, -86, -2094, -2094, -1094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -77, -2094, -2094, -1935, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -857, -2094, 1018, -2094, -2094, -1295, -2094, -2094, -2094, - -2094, -2094, 1055, -2094, -2094, -1188, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, 344, -2094, -2094, -2094, -2094, -2094, -2094, - 371, -2094, -2094, -2094, -2094, -2094, -2094, 167, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, 260, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -97, -2094, -2094, -2094, -1611, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -540, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -1687, -2094, -2094, -2094, -2094, -2094, -1680, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -1657, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -1721, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -570, -2094, -2094, -2094, -569, - -2094, -2094, -2094, -2094, -2094, -1882, -2094, -2094, -2094, -2094, - -571, -2094, -2094, -2094, -1488, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -1693, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -1692, -2094, -2094, -2094, -2094, -2094, - -2094, -1668, -2094, -2094, -2094, -2094, -2094, -2094, -1832, -2094, - -2094, -2094, -2094, -1550, -2094, -2094, -2094, -2094, -2094, -1534, - -2094, -2094, -2094, -2094, -2094, -1641, -2094, -2094, -2094, -2094, - -2094, -2094, -1720, -2094, -2094, -2094, -2094, -2094, -2094, -607, - -2094, -2094, -2094, -1574, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -1843, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -1625, - -2094, -2094, -2094, -2094, -2094, -2094, -1536, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -1699, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -1587, -2094, -2094, -2094, -2094, -2094, - -2094, -697, -2094, -2094, -2094, -1584, -2094, -2094, -2094, -2094, - -2094, -2094, -680, -2094, -2094, -2094, -679, -2094, -2094, -2094, - -2094, -2094, -1691, -2094, -2094, -2094, -2094, -1553, -2094, -2094, - -2094, -2094, -2094, -2094, -2093, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -1284, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -2094, -1557, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -696, -2094, -2094, - -2094, -2094, -2094, -2094, -2094, -2094, -2094, -699, -2094 + 554, 555, 556, 557, 558, 179, 1018, 1019, 1364, 1527, + 2406, 2407, 2408, 2409, 2411, 2412, 2413, 2410, 2414, 2415, + 2416, 2417, 2418, 2419, 1020, 1366, 1021, 1367, 1022, 1368, + 1023, 1369, 1024, 1370, 1534, 2420, 1025, 1371, 1026, 1372, + 1027, 1373, 1538, 2421, 2422, 2423, 1028, 1374, 1551, 2424, + 2425, 2426, 2427, 2428, 2429, 2431, 2432, 2430, 2433, 2434, + 2435, 2437, 2438, 2436, 2442, 2439, 2440, 2441, 2443, 1029, + 1375, 1030, 1376, 1031, 1377, 1032, 1378, 1033, 1379, 1034, + 1380, 1035, 1381, 1036, 1382, 1037, 1383, 1038, 1384, 1563, + 2444, 2445, 2446, 2447, 2448, 1039, 1385, 1565, 2449, 2450, + 2451, 2452, 1040, 1386, 1041, 1387, 1568, 2453, 1042, 1388, + 1570, 2454, 1043, 1389, 1044, 1390, 1573, 2455, 2456, 1045, + 1391, 1575, 2457, 1046, 1392, 1579, 2458, 2459, 2460, 2461, + 2462, 2463, 1047, 1393, 1048, 1394, 1049, 1395, 1050, 1396, + 1051, 1397, 1590, 2465, 2467, 2468, 2469, 2466, 2470, 2464, + 2472, 2471, 2473, 1052, 1398, 1595, 2474, 2475, 2476, 2477, + 1053, 1399, 1597, 2478, 2479, 2480, 2481, 1054, 1400, 1599, + 2482, 2483, 1055, 1401, 1603, 2484, 2486, 2485, 1056, 1402, + 1605, 2487, 2488, 2489, 1057, 1403, 1610, 2492, 2493, 2490, + 2491, 1058, 1428, 1707, 2592, 2593, 2590, 2591, 1059, 1404, + 1612, 2494, 1060, 1405, 1615, 2495, 2496, 2501, 2500, 2502, + 2497, 2499, 2503, 2504, 2498, 2505, 2506, 2507, 1061, 1406, + 1625, 2508, 2509, 2510, 2511, 2512, 2513, 2514, 2515, 2516, + 2517, 2519, 2518, 2520, 2521, 2522, 1062, 1407, 1063, 1408, + 1631, 2525, 2526, 2523, 2524, 1064, 1409, 1650, 2527, 2528, + 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2538, 2539, + 2540, 2541, 2542, 2537, 2543, 2544, 2545, 2546, 2547, 2548, + 2549, 2550, 2551, 2552, 2553, 2554, 2555, 1065, 1410, 1066, + 1411, 1067, 1412, 1068, 1413, 1661, 2556, 2557, 2558, 2559, + 2560, 2561, 2562, 1069, 1414, 1665, 2563, 2564, 2565, 2566, + 1070, 1426, 1700, 2588, 1071, 1415, 1668, 2567, 2568, 1072, + 1416, 1073, 1417, 1671, 2569, 1074, 1418, 1673, 2570, 1075, + 1419, 1076, 1420, 1677, 2572, 2571, 1077, 1421, 1679, 2573, + 2574, 2575, 2576, 2577, 2578, 2579, 1078, 1422, 1693, 2140, + 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2580, 2581, + 2582, 2583, 1079, 1429, 1721, 2163, 2164, 2165, 2166, 2167, + 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 1080, 1423, + 1081, 1424, 1697, 2584, 2585, 2586, 2587, 1082, 1425, 1083, + 1427, 1702, 2589, 1084, 1430, 1085, 1431, 1086, 1432, 1087, + 1433, 1726, 2594, 1088, 1434 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 620, 621, 1094, 197, 579, 208, 209, 210, 1138, 2169, - 2170, 2171, 2172, 1359, 1360, 657, 443, 1297, 1436, 1437, - 1956, 1439, 511, 1690, 1304, 1475, 57, 58, 12, 13, - 863, 1989, 1990, 239, 240, 805, 2348, 2349, 2350, 2351, - 2352, 2353, 2354, 2355, 2356, 571, 572, 573, 574, 575, - 236, 237, 1139, 2001, 2002, 1556, 267, 2007, 414, 415, - 416, 512, 3, 936, 1986, 4, 1579, 278, 831, 832, - 833, 834, 835, 513, 514, 515, 516, 517, 1627, 1670, - 14, 5, 15, 2117, 2010, 2011, 6, 16, 1657, 17, - 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 753, - 754, 755, 756, 757, 758, 759, 760, 761, 18, 137, - 19, 937, 1571, 1992, 1993, 1994, 1995, 20, 418, 419, - 1087, 1974, 1572, 1573, 37, 38, 138, 39, 107, 108, + 620, 621, 1096, 197, 1140, 208, 209, 210, 579, 2180, + 2181, 2182, 2183, 1300, 1362, 1363, 1440, 1441, 657, 1443, + 1307, 1963, 57, 58, 831, 832, 833, 834, 835, 2363, + 2364, 2365, 2366, 2367, 2368, 2369, 2370, 2371, 571, 572, + 573, 574, 575, 443, 805, 2015, 1993, 1996, 1997, 12, + 13, 1695, 1141, 2009, 2010, 845, 267, 3, 1148, 1149, + 1150, 1151, 1152, 1153, 1154, 1155, 1156, 278, 1591, 936, + 1632, 1708, 1709, 1710, 1711, 1712, 1713, 1714, 1715, 1716, + 2055, 2056, 2057, 2058, 2059, 137, 2060, 2061, 2062, 1561, + 1517, 1518, 1519, 1520, 239, 240, 1521, 1990, 1522, 1523, + 1981, 14, 138, 15, 2125, 5, 1592, 261, 16, 1969, + 17, 168, 169, 1479, 1089, 2018, 2019, 937, 2038, 2039, + 414, 415, 416, 541, 542, 543, 1600, 4, 1601, 18, + 6, 19, 418, 419, 236, 237, 1675, 1662, 20, 497, + 498, 499, 500, 7, 1970, 37, 38, 1602, 39, 1090, + 1576, 8, 863, 375, 9, 1593, 25, 1277, 174, 175, + 1577, 1578, 10, 262, 263, 264, 1994, 40, 41, 42, + 43, 44, 45, 46, 511, 2016, 1733, 2047, 2048, 2049, + 2126, 798, 177, 178, 806, 26, 1594, 1445, 1446, 1447, + 1448, 1449, 27, 1451, 1613, 1614, 1982, 1983, 421, 422, + 1524, 1458, 1459, 1460, 1461, 1462, 1463, 1562, 1464, 1465, + 1466, 1467, 28, 512, 1991, 1992, 1472, 1473, 1474, 1475, + 1476, 1477, 1478, 846, 847, 513, 514, 515, 516, 517, + 848, 1676, 456, 1696, 29, 2011, 2012, 1663, 1664, 501, + 938, 417, 2402, 946, 1971, 1972, 1728, 1973, 1654, 1731, + 241, 2042, 2043, 420, 836, 753, 754, 755, 756, 757, + 758, 759, 760, 761, 1998, 1633, 30, 444, 31, 576, + 1747, 1748, 1634, 1635, 1636, 1637, 1638, 1639, 1640, 1641, + 1642, 1157, 1158, 1159, 1643, 1644, 1645, 1646, 1647, 1648, + 238, 1666, 1667, 139, 1717, 1718, 1719, 2020, 2021, 1525, + 2040, 2041, 2025, 2063, 2064, 1136, 242, 1138, 1526, 2075, + 2076, 2077, 1584, 518, 519, 520, 32, 947, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 300, 2030, 2031, 301, 40, 41, 42, 43, - 44, 45, 46, 375, 7, 1088, 8, 1983, 302, 2118, - 1274, 518, 519, 520, 1703, 1704, 1705, 1706, 1707, 1708, - 1709, 1710, 1711, 1557, 1671, 806, 9, 1727, 798, 417, - 10, 1741, 1742, 1134, 1987, 1136, 241, 2008, 1658, 1659, - 1441, 1442, 1443, 1444, 1445, 1595, 1447, 1596, 421, 422, - 845, 25, 1691, 238, 1454, 1455, 1456, 1457, 1458, 1459, - 1601, 1460, 1461, 1462, 1463, 86, 1597, 1975, 1976, 1468, - 1469, 1470, 1471, 1472, 1473, 1474, 26, 1602, 1580, 1962, - 27, 1581, 456, 1582, 938, 2003, 2004, 28, 2387, 420, - 444, 29, 242, 1722, 1583, 1991, 1725, 1603, 1604, 88, - 2047, 2048, 2049, 2050, 2051, 30, 2052, 2053, 2054, 31, - 521, 522, 523, 212, 1963, 524, 2012, 2013, 525, 526, - 527, 528, 529, 1628, 1984, 1985, 576, 541, 542, 543, - 1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, 243, - 168, 169, 1638, 1639, 1640, 1641, 1642, 1643, 836, 1535, - 1536, 1537, 1538, 1539, 1540, 1541, 260, 2017, 1542, 91, - 1543, 268, 32, 1155, 1156, 1157, 33, 139, 275, 1649, - 174, 175, 279, 177, 178, 2032, 2033, 34, 1513, 1514, - 1515, 1516, 121, 940, 1517, 1584, 1518, 1519, 607, 608, - 35, 610, 2018, 36, 530, 531, 532, 533, 303, 304, - 305, 306, 307, 308, 89, 309, 310, 311, 312, 90, - 1675, 92, 1586, 1676, 1964, 1965, 21, 1966, 846, 847, - 1611, 97, 47, 93, 73, 848, 1677, 1612, 74, 75, - 76, 122, 123, 124, 1613, 1608, 1609, 1712, 1713, 1714, - 1162, 1163, 1164, 1165, 94, 22, 504, 505, 125, 506, - 1587, 507, 95, 534, 48, 59, 60, 23, 2039, 2040, - 2041, 535, 577, 1650, 1651, 1652, 1653, 1654, 893, 894, - 895, 896, 897, 898, 96, 1158, 49, 180, 181, 182, - 183, 1644, 1661, 1662, 1448, 1449, 1450, 1451, 1520, 2389, - 2390, 98, 2019, 2020, 99, 2021, 1588, 261, 1177, 1178, - 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, 1188, - 1189, 1190, 1191, 1192, 1193, 50, 101, 1942, 2749, 2750, - 2751, 2752, 126, 2055, 2056, 2034, 2035, 1589, 2070, 2071, - 1622, 51, 497, 498, 499, 500, 2079, 2080, 2081, 2082, - 2083, 2084, 2085, 2086, 2087, 52, 508, 1623, 1655, 1715, - 100, 1614, 1615, 262, 263, 264, 1616, 1698, 106, 1617, - 1618, 1619, 53, 2057, 2058, 2059, 487, 1624, 1625, 1544, - 1997, 1998, 1999, 2000, 1699, 1545, 102, 503, 103, 510, - 54, 876, 877, 540, 1521, 545, 1760, 1761, 1941, 2125, - 2126, 2127, 2128, 1522, 1700, 1701, 184, 185, 899, 900, - 901, 902, 903, 904, 905, 906, 566, 2627, 2628, 1174, - 1175, 1176, 2067, 2068, 2069, 946, 1678, 1679, 1680, 1681, - 1682, 1683, 104, 1684, 1685, 1686, 1687, 820, 821, 822, - 823, 824, 501, 105, 827, 828, 2098, 2099, 2100, 838, - 839, 840, 128, 842, 129, 1734, 2061, 2062, 2063, 2064, - 406, 854, 130, 856, 857, 858, 859, 131, 198, 199, - 200, 201, 202, 203, 425, 188, 189, 190, 191, 204, - 205, 658, 659, 660, 661, 662, 663, 664, 665, 666, - 192, 193, 194, 195, 2654, 2655, 869, 449, 871, 947, - 132, 874, 875, 1951, 1952, 1953, 1954, 2088, 460, 2680, - 2681, 2682, 2683, 2684, 2685, 2686, 2687, 2688, 2689, 2690, - 2691, 2692, 2693, 2694, 2142, 2143, 2144, 1773, 206, 948, - 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, - 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, - 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, - 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, - 989, 990, 2621, 2622, 2623, 2624, 568, 133, 570, 2594, - 2595, 2596, 580, 581, 582, 583, 584, 585, 586, 2597, - 2598, 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, - 2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615, 66, 67, - 68, 69, 70, 71, 611, 2636, 2637, 2638, 2639, 2640, - 2641, 2642, 2643, 2644, 2645, 622, 2646, 2647, 2648, 2649, - 991, 2616, 2617, 2618, 2619, 2620, 632, 633, 634, 635, - 2579, 2580, 2581, 2582, 2583, 2584, 2585, 2586, 2587, 2588, - 2589, 2590, 2591, 2592, 2650, 2651, 2652, 2653, 992, 1744, - 1745, 1746, 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, - 1755, 1756, 718, 719, 720, 721, 722, 723, 724, 993, - 994, 878, 879, 880, 881, 882, 883, 884, 885, 886, - 887, 888, 995, 2662, 2663, 2664, 2665, 135, 996, 141, - 2778, 2728, 2729, 2730, 2731, 2732, 2733, 2734, 143, 997, - 144, 2759, 2760, 2761, 2762, 998, 999, 1000, 78, 79, - 80, 81, 82, 83, 2743, 2744, 1001, 1002, 2371, 2372, - 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, 2382, - 2383, 1003, 2695, 2696, 2697, 2698, 149, 1004, 145, 1005, - 712, 713, 714, 715, 716, 717, 146, 1499, 1500, 1501, - 1502, 1503, 1504, 1505, 1506, 2667, 2668, 2669, 2670, 2671, - 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2656, 2657, - 2658, 1006, 147, 1479, 1480, 1481, 1482, 1007, 148, 1008, - 725, 726, 727, 728, 729, 730, 1009, 2659, 2660, 2661, - 1496, 1497, 1498, 910, 911, 912, 913, 914, 915, 916, - 917, 918, 150, 1010, 2630, 2631, 2632, 2633, 2634, 2635, - 2735, 2736, 2737, 2738, 151, 152, 1011, 2739, 2740, 153, - 1012, 154, 1013, 1014, 1015, 2699, 2700, 2701, 2702, 2703, - 2704, 2705, 2706, 2707, 2708, 2709, 2710, 2711, 2712, 2713, - 2714, 2715, 2716, 2717, 2718, 2719, 2720, 2721, 2722, 2723, - 2724, 2725, 2726, 2727, 2745, 2746, 2747, 2748, 2753, 2754, - 2755, 2756, 155, 156, 157, 158, 159, 160, 161, 162, - 164, 165, 166, 211, 171, 172, 173, 176, 231, 232, - 213, 244, 214, 215, 245, 216, 217, 218, 219, 220, - 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, - 234, 235, 246, 250, 247, 248, 249, 254, 251, 252, - 255, 253, 256, 257, 258, 259, 277, 265, 266, 269, - 270, 271, 272, 273, 274, 285, 299, 319, 276, 280, - 286, 281, 320, 321, 287, 288, 289, 290, 291, 292, - 322, 293, 294, 295, 296, 297, 298, 314, 315, 316, - 317, 318, 323, 333, 324, 325, 326, 327, 328, 329, - 330, 331, 332, 334, 335, 336, 337, 338, 339, 340, + 119, 120, 1999, 2000, 2001, 2002, 940, 2026, 607, 608, + 33, 610, 1655, 1656, 1657, 1658, 1659, 948, 949, 950, + 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, + 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, + 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, + 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, + 21, 2078, 2079, 47, 876, 877, 1160, 893, 894, 895, + 896, 897, 898, 34, 59, 60, 1766, 1767, 577, 1720, + 2647, 2648, 521, 522, 523, 2674, 2675, 524, 86, 22, + 525, 526, 527, 528, 529, 48, 1649, 2065, 2066, 2067, + 1660, 23, 35, 1452, 1453, 1454, 1455, 2027, 2028, 36, + 2029, 180, 181, 182, 183, 2404, 2405, 49, 991, 2759, + 2760, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, + 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1949, 2772, + 2773, 2774, 2775, 88, 1585, 300, 992, 1586, 301, 1587, + 504, 505, 212, 506, 89, 507, 1606, 2763, 2764, 50, + 1588, 302, 90, 1680, 1627, 97, 1681, 993, 994, 530, + 531, 532, 533, 1607, 98, 51, 91, 99, 243, 1682, + 995, 1628, 2005, 2006, 2007, 2008, 996, 92, 93, 52, + 94, 95, 121, 1608, 1609, 260, 101, 997, 96, 100, + 268, 1629, 1630, 998, 999, 1000, 53, 275, 1176, 1177, + 1178, 279, 106, 1948, 1001, 1002, 1164, 1165, 1166, 1167, + 132, 73, 102, 103, 54, 74, 75, 76, 534, 1003, + 184, 185, 2069, 2070, 2071, 2072, 535, 104, 1004, 105, + 1005, 122, 123, 124, 128, 1703, 2641, 2642, 2643, 2644, + 508, 1589, 129, 130, 827, 828, 131, 133, 125, 838, + 839, 840, 1704, 842, 141, 1740, 2666, 2667, 2668, 2669, + 1616, 854, 1006, 856, 857, 858, 859, 1617, 1007, 135, + 1008, 143, 1705, 1706, 1618, 144, 145, 1009, 1539, 1540, + 1541, 1542, 1543, 1544, 1545, 146, 147, 1546, 148, 1547, + 2670, 2671, 2672, 2673, 1010, 149, 869, 154, 871, 150, + 151, 874, 875, 1958, 1959, 1960, 1961, 1011, 2106, 2107, + 2108, 1012, 152, 1013, 1014, 1015, 153, 1016, 155, 188, + 189, 190, 191, 156, 157, 126, 161, 1779, 820, 821, + 822, 823, 824, 406, 192, 193, 194, 195, 2153, 2154, + 2155, 303, 304, 305, 306, 307, 308, 425, 309, 310, + 311, 312, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 1683, + 1684, 1685, 1686, 1687, 1688, 158, 1689, 1690, 1691, 1692, + 449, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, + 159, 460, 198, 199, 200, 201, 202, 203, 2613, 2614, + 2615, 1619, 1620, 204, 205, 487, 1621, 165, 160, 1622, + 1623, 1624, 2682, 2683, 2684, 2685, 503, 162, 510, 2676, + 2677, 2678, 540, 164, 545, 2616, 2617, 2618, 2619, 2620, + 2621, 2622, 2623, 2624, 2625, 2626, 2627, 2628, 2629, 2630, + 2631, 2632, 2633, 2634, 2635, 566, 66, 67, 68, 69, + 70, 71, 206, 78, 79, 80, 81, 82, 83, 568, + 166, 570, 2679, 2680, 2681, 580, 581, 582, 583, 584, + 585, 586, 2700, 2701, 2702, 2703, 2704, 2705, 2706, 2707, + 2708, 2709, 2710, 2711, 2712, 2713, 2714, 2656, 2657, 2658, + 2659, 2660, 2661, 2662, 2663, 2664, 2665, 611, 658, 659, + 660, 661, 662, 663, 664, 665, 666, 171, 622, 172, + 176, 1548, 2636, 2637, 2638, 2639, 2640, 1549, 173, 632, + 633, 634, 635, 211, 213, 214, 2801, 2782, 2783, 2784, + 2785, 215, 1550, 878, 879, 880, 881, 882, 883, 884, + 885, 886, 887, 888, 216, 2096, 2598, 2599, 2600, 2601, + 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, 2610, 2611, + 910, 911, 912, 913, 914, 915, 916, 917, 918, 217, + 1503, 1504, 1505, 1506, 1507, 1508, 1509, 1510, 1750, 1751, + 1752, 1753, 1754, 1755, 1756, 1757, 1758, 1759, 1760, 1761, + 1762, 899, 900, 901, 902, 903, 904, 905, 906, 231, + 1483, 1484, 1485, 1486, 2687, 2688, 2689, 2690, 2691, 2692, + 2693, 2694, 2695, 2696, 2697, 2698, 2699, 1500, 1501, 1502, + 2719, 2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727, 2728, + 2729, 2730, 2731, 2732, 2733, 2734, 2735, 2736, 2737, 2738, + 2739, 2740, 2741, 2742, 2743, 2744, 2745, 2746, 2747, 2386, + 2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394, 2395, 2396, + 2397, 2398, 218, 718, 719, 720, 721, 722, 723, 724, + 2748, 2749, 2750, 2751, 2752, 2753, 2754, 2765, 2766, 2767, + 2768, 2769, 2770, 2771, 712, 713, 714, 715, 716, 717, + 725, 726, 727, 728, 729, 730, 2650, 2651, 2652, 2653, + 2654, 2655, 2715, 2716, 2717, 2718, 2755, 2756, 2757, 2758, + 2776, 2777, 2778, 2779, 219, 220, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 232, 244, 234, 235, + 245, 246, 265, 247, 248, 249, 250, 251, 252, 254, + 253, 255, 256, 257, 258, 259, 266, 269, 270, 271, + 272, 273, 274, 277, 285, 299, 276, 280, 281, 293, + 319, 286, 287, 288, 289, 290, 291, 292, 320, 294, + 295, 296, 297, 298, 314, 315, 316, 317, 318, 321, + 323, 322, 324, 325, 326, 327, 333, 328, 329, 330, + 331, 332, 357, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, - 351, 352, 353, 354, 355, 357, 359, 360, 361, 362, - 363, 364, 365, 366, 367, 368, 379, 380, 381, 382, - 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, - 393, 394, 395, 396, 397, 400, 403, 402, 404, 405, - 423, 424, 426, 439, 485, 483, 427, 428, 429, 430, - 431, 432, 433, 434, 486, 435, 436, 437, 438, 440, - 465, 441, 466, 442, 445, 451, 452, 453, 454, 455, - 457, 458, 618, 459, 654, 843, 655, 669, 467, 468, - 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, - 479, 537, 480, 481, 482, 539, 569, 587, 670, 588, - 589, 590, 591, 592, 593, 594, 595, 596, 597, 609, - 612, 672, 613, 614, 615, 616, 617, 623, 624, 625, - 626, 627, 628, 629, 630, 631, 636, 637, 638, 639, - 640, 641, 642, 643, 644, 645, 646, 647, 648, 650, - 651, 652, 653, 675, 1453, 678, 667, 668, 671, 673, - 674, 676, 677, 679, 680, 681, 682, 683, 684, 685, - 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, - 696, 697, 698, 699, 700, 704, 701, 702, 703, 705, - 706, 708, 709, 710, 732, 711, 733, 734, 735, 736, - 737, 738, 739, 740, 741, 762, 763, 764, 765, 773, - 772, 774, 775, 785, 786, 787, 788, 789, 790, 791, - 792, 793, 794, 795, 796, 797, 799, 800, 801, 802, - 808, 809, 941, 812, 814, 815, 817, 943, 818, 826, - 829, 841, 942, 849, 850, 851, 852, 853, 855, 864, - 1105, 868, 870, 872, 1106, 1107, 944, 945, 1103, 1092, - 1090, 1093, 1095, 1108, 1098, 1096, 1099, 1100, 1101, 1109, - 1102, 1110, 1112, 1111, 1113, 1114, 1115, 1116, 1117, 1119, - 1118, 1120, 1121, 1122, 1197, 1198, 1123, 1124, 1125, 1126, - 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1137, 1199, 1142, - 1141, 1143, 1144, 1145, 1160, 1161, 1166, 1167, 1168, 1169, - 1170, 1171, 1172, 1173, 1203, 1194, 1195, 1204, 1205, 1196, - 1206, 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, - 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, - 1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, - 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, - 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, - 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, - 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1278, 1273, 1275, - 1276, 1283, 1277, 1281, 1290, 1289, 1295, 1309, 1321, 1322, - 1310, 1311, 1312, 1323, 1341, 1524, 1328, 1329, 1330, 1331, - 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1352, - 1356, 1353, 1354, 1508, 1525, 1357, 1435, 1440, 1446, 1464, - 1509, 1465, 1466, 1467, 1526, 1478, 1507, 1527, 1528, 1529, - 1531, 1532, 1533, 1547, 1548, 1549, 1550, 1551, 1552, 1553, - 1554, 1555, 1559, 1561, 1562, 1564, 1566, 1575, 1569, 1576, - 1567, 1577, 1578, 1591, 1593, 1621, 1646, 1599, 1606, 1647, - 1648, 1664, 1665, 1667, 1669, 1673, 1689, 1693, 1694, 1696, - 1717, 1718, 1719, 1720, 1729, 1730, 1731, 1723, 1732, 1733, - 1735, 1736, 1758, 1724, 1759, 1772, 1762, 1775, 1763, 1777, - 1764, 1765, 1766, 1767, 1789, 1792, 1768, 1794, 1769, 1770, - 1771, 1774, 1776, 1778, 1779, 1780, 1781, 1782, 1783, 1784, - 1785, 1786, 1787, 1788, 1790, 1791, 1793, 1796, 1798, 1795, - 1797, 1800, 1799, 1801, 1802, 1803, 1804, 1805, 1806, 1807, - 1813, 1808, 1809, 1810, 1811, 1812, 1960, 1961, 1814, 1815, - 1968, 1969, 1970, 1971, 1972, 1816, 1817, 1818, 1819, 1820, - 1821, 1977, 1978, 1979, 1980, 1981, 1982, 1822, 1823, 1988, - 1824, 1825, 1826, 1828, 1833, 1827, 1829, 1830, 1831, 1832, - 1834, 1835, 1836, 1837, 2009, 1838, 1839, 2014, 2015, 1848, - 2016, 1840, 1841, 2023, 2024, 2025, 1842, 2026, 2027, 2028, - 2029, 2766, 1843, 1844, 1853, 1845, 2036, 2037, 2038, 1872, - 1846, 1847, 2042, 2043, 2044, 2045, 1849, 1850, 1851, 1852, - 1880, 1854, 2060, 1884, 1855, 1856, 1857, 1858, 2072, 2073, - 2074, 1887, 2075, 2076, 2077, 2078, 1859, 1860, 1861, 2090, - 2091, 2092, 2093, 1862, 1863, 1864, 1865, 1866, 2101, 2102, - 2103, 2104, 1867, 1868, 1869, 1870, 2108, 1871, 1873, 1874, - 2112, 2113, 1875, 1876, 2115, 1877, 1878, 1879, 1881, 2120, - 1889, 2121, 1882, 1883, 1891, 1894, 2124, 1885, 1886, 1888, - 1896, 1910, 1913, 1915, 1890, 1917, 1892, 1893, 1897, 2138, - 2139, 1922, 2141, 1936, 1895, 1906, 1938, 1948, 1949, 2147, - 1959, 2148, 2149, 2150, 2151, 1898, 1899, 1900, 1901, 1902, - 1903, 1904, 1905, 2578, 1907, 1908, 1909, 1911, 1912, 1914, - 1916, 1918, 1919, 1920, 1921, 1923, 1924, 1925, 1926, 1927, - 1928, 1929, 1930, 2769, 1931, 1932, 2770, 2772, 1933, 2783, - 1097, 731, 1955, 1510, 2175, 2593, 2168, 2625, 1091, 2626, - 2629, 2666, 2757, 2741, 2758, 2742, 2763, 0, 0, 1358, - 1135, 0, 0, 0, 0, 1140, 2388, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 565, 0, 0, 0, 2771, 0, 0, - 0, 0, 0, 0, 1934, 0, 0, 0, 1935, 0, - 1937, 1939, 1940, 1967, 1957, 1958, 1973, 1996, 2005, 2006, - 2022, 2046, 2065, 2066, 2089, 0, 2094, 2095, 2096, 2776, - 2097, 2105, 2106, 2107, 2109, 2110, 2111, 2114, 2116, 0, - 2785, 2119, 0, 2174, 2122, 0, 0, 2123, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2140, 0, - 2145, 0, 0, 2146, 2774, 2165, 0, 0, 2166, 2167, - 0, 0, 0, 0, 0, 2178, 2179, 0, 0, 0, - 2180, 2181, 0, 2182, 0, 0, 2183, 2184, 0, 0, - 0, 2185, 2186, 0, 0, 2187, 0, 0, 2188, 0, - 2189, 2190, 2191, 0, 2192, 0, 2193, 0, 2194, 2195, - 2196, 2197, 0, 0, 2198, 0, 2199, 2200, 2201, 2202, - 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, - 2213, 2214, 2215, 2216, 2217, 0, 0, 2218, 2219, 0, - 2220, 2221, 0, 2222, 2223, 2224, 0, 2225, 0, 2226, - 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, - 2237, 2238, 2239, 2240, 2241, 0, 2242, 0, 2243, 2244, - 2245, 2246, 2247, 2248, 2249, 0, 2250, 2251, 2252, 2253, - 0, 0, 0, 2254, 2255, 2256, 2257, 2258, 2259, 0, - 2260, 2261, 2262, 0, 2263, 2264, 2265, 2777, 2266, 2764, - 2765, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275, - 2276, 2277, 0, 2278, 2279, 2280, 2281, 0, 2282, 2283, - 2284, 2285, 2286, 2287, 2288, 2289, 2290, 2291, 0, 2292, - 2293, 0, 2294, 2295, 2296, 2297, 2298, 2299, 2300, 0, - 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, 2310, - 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, - 2321, 2322, 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330, - 2331, 2332, 2333, 2334, 2335, 2336, 2337, 2338, 0, 2339, - 2340, 2341, 0, 0, 2342, 2343, 2344, 2345, 0, 0, - 0, 0, 2346, 0, 2347, 2357, 2358, 2359, 2360, 0, - 2361, 0, 2362, 2363, 0, 0, 2364, 2365, 2366, 2367, - 2368, 2369, 2370, 2384, 2385, 2386, 0, 0, 2779, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 351, 352, 353, 354, 355, 359, 403, 360, 361, 362, + 363, 364, 365, 366, 367, 368, 379, 380, 404, 381, + 405, 382, 383, 384, 385, 386, 387, 388, 389, 390, + 391, 392, 393, 394, 395, 396, 397, 400, 423, 402, + 424, 435, 426, 439, 427, 428, 429, 430, 431, 432, + 433, 434, 451, 436, 437, 438, 440, 441, 442, 445, + 452, 453, 454, 455, 457, 458, 483, 459, 485, 618, + 486, 654, 465, 466, 467, 468, 469, 470, 471, 472, + 473, 474, 475, 476, 477, 478, 479, 537, 480, 481, + 482, 539, 569, 587, 655, 588, 589, 590, 591, 592, + 593, 594, 595, 669, 596, 597, 609, 612, 670, 613, + 614, 615, 616, 617, 623, 624, 625, 626, 627, 628, + 629, 630, 631, 636, 637, 638, 639, 640, 641, 642, + 643, 644, 645, 646, 647, 648, 650, 651, 652, 653, + 672, 675, 684, 667, 668, 671, 673, 674, 676, 677, + 678, 679, 680, 681, 682, 683, 685, 686, 687, 688, + 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, + 699, 700, 701, 702, 703, 704, 705, 706, 708, 709, + 710, 732, 711, 733, 734, 735, 736, 737, 738, 739, + 740, 741, 762, 763, 764, 765, 773, 772, 774, 775, + 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, + 795, 796, 797, 943, 799, 800, 801, 802, 808, 809, + 941, 812, 814, 815, 817, 843, 818, 826, 829, 841, + 942, 849, 850, 851, 852, 853, 855, 864, 1107, 868, + 870, 872, 1108, 1109, 944, 945, 1105, 1094, 1092, 1095, + 1097, 1110, 1100, 1098, 1101, 1102, 1103, 1104, 1111, 1112, + 1125, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1121, 1120, + 1122, 1123, 1124, 1199, 1200, 1126, 1127, 1128, 1129, 1130, + 1131, 1132, 1133, 1134, 1135, 1139, 1201, 1144, 1143, 1145, + 1146, 1147, 1162, 1163, 1168, 1169, 1170, 1171, 1172, 1173, + 1174, 1175, 1205, 1196, 1197, 1198, 1206, 1207, 1208, 1209, + 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, + 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, + 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, + 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, + 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259, + 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, + 1270, 1271, 1272, 1273, 1274, 1275, 1281, 1276, 1278, 1279, + 1292, 1280, 1284, 1286, 1293, 1298, 1312, 1313, 1314, 1315, + 1324, 1325, 1344, 1326, 1457, 1528, 1331, 1332, 1333, 1529, + 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343, + 1355, 1359, 1356, 1357, 1512, 1530, 1360, 1439, 1444, 1450, + 1468, 1513, 1469, 1470, 1471, 1482, 1511, 1531, 1532, 1533, + 1535, 1536, 1552, 1537, 1553, 1554, 1555, 1556, 1557, 1558, + 1559, 1560, 1564, 1566, 1567, 1571, 1569, 1580, 1581, 1572, + 1574, 1582, 1583, 1596, 1626, 1651, 1598, 1604, 1611, 1652, + 1653, 1669, 1670, 1672, 1674, 1694, 1678, 1698, 1699, 1701, + 1722, 1723, 1724, 1725, 1727, 1735, 1736, 1737, 1738, 1739, + 1741, 1729, 1742, 1730, 1764, 1765, 1768, 1778, 1781, 1769, + 1770, 1783, 1771, 1796, 1799, 1772, 1801, 1773, 1774, 1775, + 1776, 1777, 1780, 1782, 1784, 1785, 1786, 1787, 1788, 1789, + 1790, 1791, 1792, 1793, 1794, 1795, 1797, 1798, 1803, 1805, + 1800, 1802, 1804, 1807, 1806, 1808, 1809, 1810, 1813, 1811, + 1812, 1814, 1967, 1968, 1815, 1816, 1975, 1976, 1977, 1978, + 1979, 1817, 1818, 1819, 1820, 1821, 1822, 1984, 1985, 1986, + 1987, 1988, 1989, 1823, 1824, 1995, 1825, 1826, 2003, 1827, + 1828, 1829, 1830, 1831, 1833, 1832, 1835, 1840, 1842, 1834, + 1836, 2017, 1837, 1838, 2022, 2023, 1839, 2024, 1841, 1843, + 2031, 2032, 2033, 1844, 2034, 2035, 2036, 2037, 1845, 1855, + 1846, 1847, 1848, 2044, 2045, 2046, 2789, 1849, 1850, 2050, + 2051, 2052, 2053, 1851, 1860, 1879, 1887, 1852, 1853, 2068, + 1854, 1856, 1891, 1857, 1894, 2080, 2081, 2082, 1858, 2083, + 2084, 2085, 2086, 1896, 1859, 1861, 2098, 2099, 2100, 2101, + 1862, 1863, 1864, 1865, 1866, 2109, 2110, 2111, 2112, 1867, + 1868, 1869, 1870, 2116, 1871, 1872, 1873, 2120, 2121, 1874, + 1875, 2123, 1876, 1877, 1878, 1880, 2128, 1881, 2129, 1882, + 1883, 1884, 1885, 2132, 1886, 1888, 1889, 1898, 1901, 1890, + 1892, 1893, 1895, 1897, 1899, 1903, 2149, 2150, 1900, 2152, + 1917, 1902, 1913, 1920, 1922, 1924, 2158, 1904, 2159, 2160, + 2161, 2162, 1929, 1943, 1945, 1955, 1962, 1905, 1906, 1907, + 1908, 1909, 1910, 1911, 1912, 2597, 1914, 1915, 1916, 1918, + 1919, 1921, 1923, 1925, 1926, 1927, 1928, 1930, 1931, 1932, + 1933, 1934, 1935, 1936, 1937, 1938, 2792, 1939, 1940, 1941, + 2793, 2795, 2806, 731, 1514, 2186, 1099, 2179, 2612, 1137, + 1093, 2645, 2649, 1361, 2646, 2686, 1142, 2780, 2761, 2781, + 2762, 2786, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 2403, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 565, 0, 0, 0, 0, 0, + 0, 0, 0, 2794, 0, 0, 0, 0, 0, 0, + 1942, 0, 1944, 1946, 1956, 0, 0, 1947, 1966, 1964, + 1965, 1974, 0, 1980, 2004, 2013, 2014, 2030, 2054, 2073, + 2074, 2097, 0, 2102, 2103, 0, 2104, 2105, 2113, 2114, + 2115, 2117, 2799, 2118, 2119, 2122, 2124, 0, 0, 2127, + 0, 0, 0, 2808, 2151, 0, 0, 0, 0, 0, + 0, 0, 2130, 0, 2131, 0, 0, 2156, 0, 2157, + 2176, 0, 0, 2177, 0, 0, 2178, 0, 0, 0, + 2185, 2189, 0, 0, 0, 2190, 2191, 0, 0, 2192, + 0, 2193, 2194, 0, 0, 0, 2195, 0, 2196, 0, + 0, 0, 0, 2197, 2198, 0, 2199, 2200, 2201, 2202, + 0, 0, 2203, 2204, 0, 2205, 0, 0, 2206, 0, + 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 2216, + 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, + 2227, 0, 0, 2228, 2229, 2230, 0, 2231, 2232, 0, + 2233, 0, 2234, 2235, 2236, 2237, 2238, 2239, 2240, 2241, + 2242, 2243, 2244, 2245, 2246, 2247, 2248, 0, 2249, 2250, + 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 0, + 2260, 2261, 0, 2262, 0, 2263, 2264, 0, 2265, 0, + 0, 0, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, + 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2787, 2788, + 2282, 0, 0, 2283, 2284, 2285, 2286, 2287, 2288, 2289, + 2290, 2291, 2292, 2293, 2294, 2295, 2296, 0, 0, 0, + 2297, 2298, 2299, 2300, 2301, 0, 2302, 0, 2303, 2304, + 2305, 2306, 2307, 2308, 2309, 2310, 0, 2311, 2312, 2313, + 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, 2323, + 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, + 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, + 2344, 2345, 2346, 2347, 2348, 2349, 2350, 2351, 2352, 2353, + 0, 0, 2354, 2355, 2356, 2357, 2358, 2359, 0, 2360, + 2361, 2362, 2372, 0, 2373, 2374, 0, 0, 0, 2375, + 2376, 2377, 2378, 2379, 2380, 0, 0, 0, 0, 2381, + 2382, 2383, 2384, 2385, 2399, 2400, 2401, 0, 2800, 0, + 0, 2797, 2802, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3656,681 +2903,880 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 2781 + 0, 0, 0, 0, 0, 0, 2804 }; -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-2094))) - -#define yytable_value_is_error(Yytable_value) \ - YYID (0) - static const yytype_int16 yycheck[] = { - 447, 448, 816, 100, 405, 102, 103, 104, 865, 1944, - 1945, 1946, 1947, 1201, 1202, 486, 68, 1111, 1279, 1280, - 1757, 1282, 22, 190, 1118, 1320, 13, 14, 5, 6, - 707, 185, 186, 185, 186, 20, 2129, 2130, 2131, 2132, - 2133, 2134, 2135, 2136, 2137, 15, 16, 17, 18, 19, - 185, 186, 866, 13, 14, 72, 153, 68, 36, 37, - 38, 61, 0, 20, 68, 156, 5, 164, 78, 79, - 80, 81, 82, 73, 74, 75, 76, 77, 22, 217, - 57, 420, 59, 191, 13, 14, 421, 64, 183, 66, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 598, - 599, 600, 601, 602, 603, 604, 605, 606, 85, 67, - 87, 68, 190, 405, 406, 407, 408, 94, 36, 37, - 68, 80, 200, 201, 7, 8, 84, 10, 43, 44, + 447, 448, 816, 100, 865, 102, 103, 104, 405, 1951, + 1952, 1953, 1954, 1113, 1203, 1204, 1282, 1283, 486, 1285, + 1120, 1763, 13, 14, 78, 79, 80, 81, 82, 2140, + 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 15, 16, + 17, 18, 19, 68, 20, 68, 68, 185, 186, 5, + 6, 190, 866, 13, 14, 98, 153, 0, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 164, 248, 20, + 22, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 20, 21, 22, 23, 24, 67, 26, 27, 28, 72, + 164, 165, 166, 167, 185, 186, 170, 68, 172, 173, + 80, 57, 84, 59, 191, 425, 286, 40, 64, 33, + 66, 13, 14, 1323, 68, 13, 14, 68, 13, 14, + 36, 37, 38, 61, 62, 63, 181, 156, 183, 85, + 426, 87, 36, 37, 185, 186, 217, 183, 94, 60, + 61, 62, 63, 425, 68, 7, 8, 202, 10, 103, + 190, 426, 707, 250, 425, 335, 3, 1018, 36, 37, + 200, 201, 427, 96, 97, 98, 188, 29, 30, 31, + 32, 33, 34, 35, 22, 198, 1442, 403, 404, 405, + 267, 649, 11, 12, 160, 3, 366, 1287, 1288, 1289, + 1290, 1291, 3, 1293, 205, 206, 176, 177, 295, 296, + 274, 1301, 1302, 1303, 1304, 1305, 1306, 190, 1308, 1309, + 1310, 1311, 3, 61, 185, 186, 1316, 1317, 1318, 1319, + 1320, 1321, 1322, 266, 267, 73, 74, 75, 76, 77, + 273, 312, 329, 372, 3, 195, 196, 283, 284, 160, + 191, 157, 2184, 9, 168, 169, 1435, 171, 183, 1438, + 341, 13, 14, 157, 308, 598, 599, 600, 601, 602, + 603, 604, 605, 606, 402, 217, 3, 292, 3, 246, + 1480, 1481, 224, 225, 226, 227, 228, 229, 230, 231, + 232, 243, 244, 245, 236, 237, 238, 239, 240, 241, + 341, 294, 295, 275, 243, 244, 245, 195, 196, 373, + 195, 196, 33, 243, 244, 860, 397, 862, 382, 316, + 317, 318, 5, 161, 162, 163, 3, 83, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 43, 13, 14, 46, 29, 30, 31, 32, - 33, 34, 35, 250, 420, 103, 421, 68, 59, 267, - 1017, 161, 162, 163, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 190, 312, 160, 420, 1438, 649, 157, - 422, 1476, 1477, 860, 188, 862, 338, 198, 283, 284, - 1284, 1285, 1286, 1287, 1288, 181, 1290, 183, 295, 296, - 98, 3, 369, 338, 1298, 1299, 1300, 1301, 1302, 1303, - 166, 1305, 1306, 1307, 1308, 383, 202, 176, 177, 1313, - 1314, 1315, 1316, 1317, 1318, 1319, 3, 183, 167, 33, - 3, 170, 329, 172, 191, 195, 196, 3, 2173, 157, - 292, 3, 394, 1431, 183, 399, 1434, 203, 204, 423, - 20, 21, 22, 23, 24, 3, 26, 27, 28, 3, - 260, 261, 262, 106, 68, 265, 195, 196, 268, 269, - 270, 271, 272, 217, 185, 186, 246, 61, 62, 63, - 224, 225, 226, 227, 228, 229, 230, 231, 232, 132, - 13, 14, 236, 237, 238, 239, 240, 241, 308, 178, - 179, 180, 181, 182, 183, 184, 149, 33, 187, 423, - 189, 154, 3, 243, 244, 245, 3, 275, 161, 183, - 36, 37, 165, 11, 12, 195, 196, 3, 164, 165, - 166, 167, 247, 804, 170, 274, 172, 173, 435, 436, - 3, 438, 68, 3, 344, 345, 346, 347, 249, 250, - 251, 252, 253, 254, 3, 256, 257, 258, 259, 3, - 43, 423, 248, 46, 168, 169, 343, 171, 266, 267, - 183, 3, 255, 423, 95, 273, 59, 190, 99, 100, - 101, 296, 297, 298, 197, 205, 206, 243, 244, 245, - 889, 890, 891, 892, 423, 372, 60, 61, 313, 63, - 286, 65, 423, 403, 287, 392, 393, 384, 400, 401, - 402, 411, 382, 277, 278, 279, 280, 281, 766, 767, - 768, 769, 770, 771, 423, 355, 309, 39, 40, 41, - 42, 375, 294, 295, 1291, 1292, 1293, 1294, 274, 2176, - 2177, 3, 168, 169, 3, 171, 332, 40, 919, 920, - 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, - 931, 932, 933, 934, 935, 348, 3, 1728, 2561, 2562, - 2563, 2564, 387, 243, 244, 13, 14, 363, 320, 321, - 166, 364, 60, 61, 62, 63, 215, 216, 217, 218, - 219, 220, 221, 222, 223, 378, 160, 183, 362, 355, - 423, 314, 315, 96, 97, 98, 319, 166, 4, 322, - 323, 324, 395, 207, 208, 209, 359, 203, 204, 398, - 191, 192, 193, 194, 183, 404, 423, 370, 423, 372, - 413, 740, 741, 376, 370, 378, 1511, 1512, 1726, 327, - 328, 329, 330, 379, 203, 204, 158, 159, 105, 106, - 107, 108, 109, 110, 111, 112, 399, 2439, 2440, 907, - 908, 909, 316, 317, 318, 9, 249, 250, 251, 252, - 253, 254, 423, 256, 257, 258, 259, 68, 69, 70, - 71, 72, 160, 423, 681, 682, 233, 234, 235, 686, - 687, 688, 423, 690, 423, 1452, 210, 211, 212, 213, - 285, 698, 423, 700, 701, 702, 703, 423, 349, 350, - 351, 352, 353, 354, 299, 288, 289, 290, 291, 360, - 361, 488, 489, 490, 491, 492, 493, 494, 495, 496, - 303, 304, 305, 306, 2466, 2467, 733, 322, 735, 83, - 4, 738, 739, 1737, 1738, 1739, 1740, 376, 333, 2492, - 2493, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, - 2503, 2504, 2505, 2506, 366, 367, 368, 1524, 409, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 2433, 2434, 2435, 2436, 401, 58, 403, 2406, - 2407, 2408, 407, 408, 409, 410, 411, 412, 413, 2409, + 55, 56, 408, 409, 410, 411, 804, 68, 435, 436, + 3, 438, 277, 278, 279, 280, 281, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 346, 320, 321, 255, 740, 741, 358, 766, 767, 768, + 769, 770, 771, 3, 395, 396, 1515, 1516, 385, 358, + 2455, 2456, 260, 261, 262, 2482, 2483, 265, 386, 375, + 268, 269, 270, 271, 272, 287, 378, 207, 208, 209, + 365, 387, 3, 1294, 1295, 1296, 1297, 168, 169, 3, + 171, 39, 40, 41, 42, 2187, 2188, 309, 214, 2567, + 2568, 919, 920, 921, 922, 923, 924, 925, 926, 927, + 928, 929, 930, 931, 932, 933, 934, 935, 1734, 2580, + 2581, 2582, 2583, 428, 167, 43, 242, 170, 46, 172, + 60, 61, 106, 63, 3, 65, 166, 2571, 2572, 351, + 183, 59, 3, 43, 166, 3, 46, 263, 264, 347, + 348, 349, 350, 183, 3, 367, 428, 3, 132, 59, + 276, 183, 191, 192, 193, 194, 282, 428, 428, 381, + 428, 428, 247, 203, 204, 149, 3, 293, 428, 428, + 154, 203, 204, 299, 300, 301, 398, 161, 907, 908, + 909, 165, 4, 1732, 310, 311, 889, 890, 891, 892, + 4, 95, 428, 428, 416, 99, 100, 101, 406, 325, + 158, 159, 210, 211, 212, 213, 414, 428, 334, 428, + 336, 296, 297, 298, 428, 166, 2449, 2450, 2451, 2452, + 160, 274, 428, 428, 681, 682, 428, 58, 313, 686, + 687, 688, 183, 690, 86, 1456, 2474, 2475, 2476, 2477, + 183, 698, 368, 700, 701, 702, 703, 190, 374, 65, + 376, 428, 203, 204, 197, 428, 428, 383, 178, 179, + 180, 181, 182, 183, 184, 428, 428, 187, 428, 189, + 2478, 2479, 2480, 2481, 400, 4, 733, 4, 735, 428, + 428, 738, 739, 1743, 1744, 1745, 1746, 413, 233, 234, + 235, 417, 428, 419, 420, 421, 428, 423, 428, 288, + 289, 290, 291, 428, 428, 390, 4, 1528, 68, 69, + 70, 71, 72, 285, 303, 304, 305, 306, 369, 370, + 371, 249, 250, 251, 252, 253, 254, 299, 256, 257, + 258, 259, 327, 328, 329, 330, 331, 332, 333, 249, + 250, 251, 252, 253, 254, 428, 256, 257, 258, 259, + 322, 215, 216, 217, 218, 219, 220, 221, 222, 223, + 428, 333, 352, 353, 354, 355, 356, 357, 2421, 2422, + 2423, 314, 315, 363, 364, 359, 319, 4, 428, 322, + 323, 324, 2490, 2491, 2492, 2493, 370, 424, 372, 2484, + 2485, 2486, 376, 428, 378, 2424, 2425, 2426, 2427, 2428, + 2429, 2430, 2431, 2432, 2433, 2434, 2435, 2436, 2437, 2438, + 2439, 2440, 2441, 2442, 2443, 399, 88, 89, 90, 91, + 92, 93, 412, 88, 89, 90, 91, 92, 93, 401, + 424, 403, 2487, 2488, 2489, 407, 408, 409, 410, 411, + 412, 413, 2508, 2509, 2510, 2511, 2512, 2513, 2514, 2515, + 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2464, 2465, 2466, + 2467, 2468, 2469, 2470, 2471, 2472, 2473, 439, 488, 489, + 490, 491, 492, 493, 494, 495, 496, 425, 450, 425, + 424, 401, 2444, 2445, 2446, 2447, 2448, 407, 425, 461, + 462, 463, 464, 415, 428, 428, 2798, 2590, 2591, 2592, + 2593, 428, 422, 742, 743, 744, 745, 746, 747, 748, + 749, 750, 751, 752, 428, 379, 2406, 2407, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418, 2419, - 2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 88, 89, - 90, 91, 92, 93, 439, 2448, 2449, 2450, 2451, 2452, - 2453, 2454, 2455, 2456, 2457, 450, 2458, 2459, 2460, 2461, - 214, 2428, 2429, 2430, 2431, 2432, 461, 462, 463, 464, - 2391, 2392, 2393, 2394, 2395, 2396, 2397, 2398, 2399, 2400, - 2401, 2402, 2403, 2404, 2462, 2463, 2464, 2465, 242, 1483, - 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1493, - 1494, 1495, 552, 553, 554, 555, 556, 557, 558, 263, - 264, 742, 743, 744, 745, 746, 747, 748, 749, 750, - 751, 752, 276, 2474, 2475, 2476, 2477, 65, 282, 86, - 2775, 2540, 2541, 2542, 2543, 2544, 2545, 2546, 423, 293, - 423, 2571, 2572, 2573, 2574, 299, 300, 301, 88, 89, - 90, 91, 92, 93, 2555, 2556, 310, 311, 2152, 2153, - 2154, 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, - 2164, 325, 2507, 2508, 2509, 2510, 4, 331, 423, 333, - 546, 547, 548, 549, 550, 551, 423, 1344, 1345, 1346, - 1347, 1348, 1349, 1350, 1351, 2479, 2480, 2481, 2482, 2483, - 2484, 2485, 2486, 2487, 2488, 2489, 2490, 2491, 2468, 2469, - 2470, 365, 423, 1324, 1325, 1326, 1327, 371, 423, 373, - 559, 560, 561, 562, 563, 564, 380, 2471, 2472, 2473, - 1341, 1342, 1343, 776, 777, 778, 779, 780, 781, 782, - 783, 784, 423, 397, 2442, 2443, 2444, 2445, 2446, 2447, - 2547, 2548, 2549, 2550, 423, 423, 410, 2551, 2552, 423, - 414, 4, 416, 417, 418, 2511, 2512, 2513, 2514, 2515, - 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, - 2526, 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, - 2536, 2537, 2538, 2539, 2557, 2558, 2559, 2560, 2565, 2566, - 2567, 2568, 423, 423, 423, 423, 423, 423, 4, 419, - 423, 4, 419, 412, 420, 420, 420, 419, 3, 3, - 423, 3, 423, 423, 4, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 419, 419, 3, 423, 4, 3, 3, 419, 4, 3, - 419, 4, 419, 419, 419, 419, 4, 420, 419, 419, - 419, 419, 419, 419, 419, 4, 4, 3, 422, 422, - 422, 420, 3, 3, 422, 422, 422, 422, 422, 422, - 4, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 422, 4, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 422, 422, 422, 422, 420, 420, 420, - 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, - 420, 420, 420, 420, 420, 388, 4, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 4, 423, 3, 3, - 419, 419, 422, 4, 3, 160, 422, 422, 422, 422, - 422, 422, 422, 422, 4, 423, 423, 423, 423, 420, - 424, 420, 424, 420, 420, 419, 419, 419, 419, 419, - 419, 419, 104, 420, 3, 67, 4, 3, 424, 424, - 424, 424, 424, 424, 424, 424, 424, 424, 424, 422, - 424, 419, 424, 424, 424, 422, 420, 422, 3, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 420, - 422, 4, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 420, 420, 420, 420, - 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, - 420, 420, 420, 3, 20, 4, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 3, 3, - 423, 423, 423, 423, 423, 3, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 4, 423, 423, 423, 422, - 4, 423, 3, 3, 424, 4, 423, 423, 423, 423, - 3, 423, 423, 4, 4, 422, 422, 422, 422, 4, - 423, 4, 4, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 420, 419, 423, 420, 420, 419, 419, 4, 420, 419, - 419, 419, 423, 420, 420, 420, 420, 419, 419, 419, - 3, 420, 420, 420, 3, 3, 422, 422, 420, 422, - 424, 422, 422, 3, 422, 424, 422, 422, 422, 420, - 422, 3, 422, 4, 422, 422, 422, 422, 3, 422, - 4, 422, 422, 422, 4, 419, 424, 424, 424, 424, - 422, 422, 422, 422, 422, 422, 422, 422, 420, 422, - 424, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 3, 423, 423, 3, 3, 423, + 776, 777, 778, 779, 780, 781, 782, 783, 784, 428, + 1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354, 1487, 1488, + 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, + 1499, 105, 106, 107, 108, 109, 110, 111, 112, 3, + 1327, 1328, 1329, 1330, 2495, 2496, 2497, 2498, 2499, 2500, + 2501, 2502, 2503, 2504, 2505, 2506, 2507, 1344, 1345, 1346, + 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, + 2537, 2538, 2539, 2540, 2541, 2542, 2543, 2544, 2545, 2546, + 2547, 2548, 2549, 2550, 2551, 2552, 2553, 2554, 2555, 2163, + 2164, 2165, 2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173, + 2174, 2175, 428, 552, 553, 554, 555, 556, 557, 558, + 2556, 2557, 2558, 2559, 2560, 2561, 2562, 2573, 2574, 2575, + 2576, 2577, 2578, 2579, 546, 547, 548, 549, 550, 551, + 559, 560, 561, 562, 563, 564, 2458, 2459, 2460, 2461, + 2462, 2463, 2523, 2524, 2525, 2526, 2563, 2564, 2565, 2566, + 2584, 2585, 2586, 2587, 428, 428, 428, 428, 428, 428, + 428, 428, 428, 428, 428, 428, 3, 3, 424, 424, + 4, 3, 425, 4, 3, 3, 428, 4, 3, 424, + 4, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 424, 424, 424, 4, 4, 4, 427, 427, 425, 428, + 3, 427, 427, 427, 427, 427, 427, 427, 3, 428, + 428, 428, 428, 428, 428, 428, 428, 428, 428, 3, + 427, 4, 428, 428, 428, 428, 4, 428, 428, 428, + 428, 428, 391, 427, 427, 427, 427, 425, 425, 425, + 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 425, 425, 425, 4, 4, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 3, 427, + 3, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 424, 428, + 424, 428, 427, 4, 427, 427, 427, 427, 427, 427, + 427, 427, 424, 428, 428, 428, 425, 425, 425, 425, + 424, 424, 424, 424, 424, 424, 160, 425, 3, 104, + 4, 3, 429, 429, 429, 429, 429, 429, 429, 429, + 429, 429, 429, 429, 429, 427, 429, 424, 429, 429, + 429, 427, 425, 427, 4, 427, 427, 427, 427, 427, + 427, 427, 427, 3, 427, 427, 425, 427, 3, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, + 4, 3, 3, 428, 428, 428, 428, 428, 428, 428, + 4, 428, 428, 428, 428, 428, 3, 428, 428, 428, + 428, 428, 3, 428, 428, 428, 428, 428, 428, 428, + 428, 428, 428, 428, 428, 4, 427, 4, 428, 3, + 3, 429, 4, 428, 428, 428, 428, 3, 428, 428, + 4, 4, 427, 427, 427, 427, 4, 428, 4, 4, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 4, 427, 427, 427, 427, 425, 424, + 428, 425, 425, 424, 424, 67, 425, 424, 424, 424, + 428, 425, 425, 425, 425, 424, 424, 424, 3, 425, + 425, 425, 3, 3, 427, 427, 425, 427, 429, 427, + 427, 3, 427, 429, 427, 427, 427, 427, 425, 3, + 429, 4, 427, 427, 427, 427, 427, 3, 427, 4, + 427, 427, 427, 4, 424, 429, 429, 429, 427, 427, + 427, 427, 427, 427, 427, 427, 425, 427, 429, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 3, 428, 428, 428, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 420, 4, 3, - 3, 420, 4, 4, 4, 423, 3, 420, 4, 4, - 420, 420, 420, 420, 4, 4, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 419, - 422, 420, 420, 424, 4, 422, 422, 422, 420, 422, - 424, 422, 422, 422, 4, 422, 422, 4, 4, 174, - 4, 4, 175, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 190, 4, 197, 197, 4, 4, 199, 4, - 190, 4, 4, 190, 190, 4, 4, 190, 190, 4, - 4, 4, 396, 302, 4, 326, 4, 4, 374, 415, - 4, 4, 4, 375, 422, 4, 4, 102, 4, 4, - 423, 4, 420, 102, 420, 4, 423, 4, 423, 4, - 423, 423, 423, 423, 4, 4, 423, 4, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 4, 4, 423, - 423, 4, 423, 423, 4, 423, 423, 423, 4, 423, - 4, 423, 423, 423, 423, 423, 1763, 1764, 423, 423, - 1767, 1768, 1769, 1770, 1771, 423, 423, 4, 423, 4, - 423, 1778, 1779, 1780, 1781, 1782, 1783, 4, 423, 1786, - 423, 423, 4, 4, 4, 423, 423, 423, 423, 423, - 423, 4, 423, 423, 1801, 4, 423, 1804, 1805, 4, - 1807, 423, 423, 1810, 1811, 1812, 423, 1814, 1815, 1816, - 1817, 2578, 423, 423, 4, 423, 1823, 1824, 1825, 4, - 423, 423, 1829, 1830, 1831, 1832, 423, 423, 423, 423, - 4, 423, 1839, 4, 423, 423, 423, 423, 1845, 1846, - 1847, 4, 1849, 1850, 1851, 1852, 423, 423, 423, 1856, - 1857, 1858, 1859, 423, 423, 423, 423, 423, 1865, 1866, - 1867, 1868, 423, 423, 423, 423, 1873, 423, 423, 423, - 1877, 1878, 423, 423, 1881, 423, 423, 423, 423, 1886, - 4, 1888, 423, 423, 4, 4, 1893, 423, 423, 423, - 4, 4, 4, 4, 423, 4, 423, 423, 422, 1906, - 1907, 4, 1909, 4, 423, 423, 4, 4, 419, 1916, - 419, 1918, 1919, 1920, 1921, 422, 422, 422, 422, 422, - 422, 422, 422, 3, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 422, 422, 422, 422, 422, - 422, 422, 422, 4, 422, 422, 4, 4, 422, 4, - 819, 567, 1743, 1355, 1950, 2405, 1943, 2437, 813, 2438, - 2441, 2478, 2569, 2553, 2570, 2554, 2575, -1, -1, 1200, - 861, -1, -1, -1, -1, 867, 62, -1, -1, -1, + 3, 3, 3, 3, 3, 3, 425, 4, 3, 3, + 428, 4, 4, 425, 4, 3, 425, 425, 425, 425, + 4, 4, 4, 425, 20, 4, 427, 427, 427, 4, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 424, 427, 425, 425, 429, 4, 427, 427, 427, 425, + 427, 429, 427, 427, 427, 427, 427, 4, 4, 174, + 4, 4, 4, 175, 4, 4, 4, 4, 4, 4, + 4, 4, 190, 4, 197, 4, 197, 4, 4, 190, + 199, 4, 4, 190, 4, 4, 190, 190, 190, 4, + 4, 4, 399, 302, 4, 4, 326, 4, 377, 418, + 4, 4, 4, 378, 4, 427, 4, 4, 4, 4, + 428, 102, 4, 102, 425, 425, 428, 4, 4, 428, + 428, 4, 428, 4, 4, 428, 4, 428, 428, 428, + 428, 428, 428, 428, 428, 428, 428, 428, 428, 428, + 428, 428, 428, 428, 428, 428, 428, 428, 4, 4, + 428, 428, 428, 4, 428, 428, 4, 428, 4, 428, + 428, 428, 1769, 1770, 428, 428, 1773, 1774, 1775, 1776, + 1777, 428, 428, 428, 4, 428, 428, 1784, 1785, 1786, + 1787, 1788, 1789, 428, 428, 1792, 4, 428, 1795, 4, + 428, 4, 428, 428, 4, 428, 4, 4, 4, 428, + 428, 1808, 428, 428, 1811, 1812, 428, 1814, 428, 428, + 1817, 1818, 1819, 428, 1821, 1822, 1823, 1824, 4, 4, + 428, 428, 428, 1830, 1831, 1832, 2597, 428, 428, 1836, + 1837, 1838, 1839, 428, 4, 4, 4, 428, 428, 1846, + 428, 428, 4, 428, 4, 1852, 1853, 1854, 428, 1856, + 1857, 1858, 1859, 4, 428, 428, 1863, 1864, 1865, 1866, + 428, 428, 428, 428, 428, 1872, 1873, 1874, 1875, 428, + 428, 428, 428, 1880, 428, 428, 428, 1884, 1885, 428, + 428, 1888, 428, 428, 428, 428, 1893, 428, 1895, 428, + 428, 428, 428, 1900, 428, 428, 428, 4, 4, 428, + 428, 428, 428, 428, 428, 4, 1913, 1914, 428, 1916, + 4, 428, 428, 4, 4, 4, 1923, 427, 1925, 1926, + 1927, 1928, 4, 4, 4, 4, 1749, 427, 427, 427, + 427, 427, 427, 427, 427, 3, 428, 428, 428, 428, + 428, 428, 428, 428, 428, 428, 428, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 4, 427, 427, 427, + 4, 4, 4, 567, 1358, 1957, 819, 1950, 2420, 861, + 813, 2453, 2457, 1202, 2454, 2494, 867, 2588, 2569, 2589, + 2570, 2594, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 62, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 398, -1, -1, -1, -1, -1, + -1, -1, -1, 102, -1, -1, -1, -1, -1, -1, + 427, -1, 428, 428, 424, -1, -1, 428, 424, 427, + 427, 424, -1, 425, 424, 424, 424, 424, 424, 424, + 424, 424, -1, 425, 424, -1, 424, 424, 424, 424, + 424, 424, 2796, 424, 424, 424, 424, -1, -1, 424, + -1, -1, -1, 2807, 425, -1, -1, -1, -1, -1, + -1, -1, 424, -1, 424, -1, -1, 425, -1, 424, + 424, -1, -1, 424, -1, -1, 424, -1, -1, -1, + 427, 427, -1, -1, -1, 427, 427, -1, -1, 427, + -1, 427, 427, -1, -1, -1, 427, -1, 427, -1, + -1, -1, -1, 427, 427, -1, 427, 427, 427, 427, + -1, -1, 427, 427, -1, 427, -1, -1, 427, -1, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, -1, -1, 427, 427, 427, -1, 427, 427, -1, + 427, -1, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, -1, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, -1, + 427, 427, -1, 427, -1, 427, 427, -1, 427, -1, + -1, -1, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 2595, 2596, + 427, -1, -1, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, -1, -1, -1, + 427, 427, 427, 427, 427, -1, 427, -1, 427, 427, + 427, 427, 427, 427, 427, 427, -1, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + -1, -1, 427, 427, 427, 427, 427, 427, -1, 427, + 427, 427, 427, -1, 427, 427, -1, -1, -1, 427, + 427, 427, 427, 427, 427, -1, -1, -1, -1, 427, + 427, 427, 427, 427, 427, 427, 427, -1, 424, -1, + -1, 428, 427, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 398, -1, -1, -1, 102, -1, -1, - -1, -1, -1, -1, 422, -1, -1, -1, 422, -1, - 423, 423, 423, 419, 422, 422, 420, 419, 419, 419, - 419, 419, 419, 419, 419, -1, 420, 419, 419, 2773, - 419, 419, 419, 419, 419, 419, 419, 419, 419, -1, - 2784, 419, -1, 422, 419, -1, -1, 419, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 420, -1, - 420, -1, -1, 419, 423, 419, -1, -1, 419, 419, - -1, -1, -1, -1, -1, 422, 422, -1, -1, -1, - 422, 422, -1, 422, -1, -1, 422, 422, -1, -1, - -1, 422, 422, -1, -1, 422, -1, -1, 422, -1, - 422, 422, 422, -1, 422, -1, 422, -1, 422, 422, - 422, 422, -1, -1, 422, -1, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, -1, -1, 422, 422, -1, - 422, 422, -1, 422, 422, 422, -1, 422, -1, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, -1, 422, -1, 422, 422, - 422, 422, 422, 422, 422, -1, 422, 422, 422, 422, - -1, -1, -1, 422, 422, 422, 422, 422, 422, -1, - 422, 422, 422, -1, 422, 422, 422, 419, 422, 2576, - 2577, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, -1, 422, 422, 422, 422, -1, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, -1, 422, - 422, -1, 422, 422, 422, 422, 422, 422, 422, -1, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, -1, 422, - 422, 422, -1, -1, 422, 422, 422, 422, -1, -1, - -1, -1, 422, -1, 422, 422, 422, 422, 422, -1, - 422, -1, 422, 422, -1, -1, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, -1, -1, 422, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 2780 + -1, -1, -1, -1, -1, -1, 2803 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 426, 427, 0, 156, 420, 421, 420, 421, 420, - 422, 428, 5, 6, 57, 59, 64, 66, 85, 87, - 94, 343, 372, 384, 429, 3, 3, 3, 3, 3, + 0, 431, 432, 0, 156, 425, 426, 425, 426, 425, + 427, 433, 5, 6, 57, 59, 64, 66, 85, 87, + 94, 346, 375, 387, 434, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 8, 10, 29, 30, 31, 32, 33, 34, 35, 255, 287, 309, - 348, 364, 378, 395, 413, 446, 430, 13, 14, 392, - 393, 562, 438, 432, 434, 436, 88, 89, 90, 91, - 92, 93, 678, 95, 99, 100, 101, 702, 88, 89, - 90, 91, 92, 93, 685, 440, 383, 444, 423, 3, - 3, 423, 423, 423, 423, 423, 423, 3, 3, 3, - 423, 3, 423, 423, 423, 423, 4, 43, 44, 45, + 351, 367, 381, 398, 416, 451, 435, 13, 14, 395, + 396, 567, 443, 437, 439, 441, 88, 89, 90, 91, + 92, 93, 683, 95, 99, 100, 101, 707, 88, 89, + 90, 91, 92, 93, 690, 445, 386, 449, 428, 3, + 3, 428, 428, 428, 428, 428, 428, 3, 3, 3, + 428, 3, 428, 428, 428, 428, 4, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 247, 296, 297, 298, 313, 387, 528, 423, 423, - 423, 423, 4, 58, 667, 65, 572, 67, 84, 275, - 602, 86, 658, 423, 423, 423, 423, 423, 423, 4, - 423, 423, 423, 423, 4, 423, 423, 423, 423, 423, - 423, 4, 419, 442, 423, 4, 419, 455, 13, 14, - 478, 420, 420, 420, 36, 37, 419, 11, 12, 710, - 39, 40, 41, 42, 158, 159, 503, 456, 288, 289, - 290, 291, 303, 304, 305, 306, 515, 710, 349, 350, - 351, 352, 353, 354, 360, 361, 409, 692, 710, 710, - 710, 412, 429, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 3, 3, 431, 419, 419, 185, 186, 338, 185, - 186, 338, 394, 429, 3, 4, 3, 4, 3, 3, - 423, 4, 3, 4, 419, 419, 419, 419, 419, 419, - 429, 40, 96, 97, 98, 420, 419, 710, 429, 419, - 419, 419, 419, 419, 419, 429, 422, 4, 710, 429, - 422, 420, 476, 479, 480, 4, 422, 422, 422, 422, - 422, 422, 422, 423, 423, 423, 423, 423, 423, 4, + 56, 247, 296, 297, 298, 313, 390, 533, 428, 428, + 428, 428, 4, 58, 672, 65, 577, 67, 84, 275, + 607, 86, 663, 428, 428, 428, 428, 428, 428, 4, + 428, 428, 428, 428, 4, 428, 428, 428, 428, 428, + 428, 4, 424, 447, 428, 4, 424, 460, 13, 14, + 483, 425, 425, 425, 36, 37, 424, 11, 12, 715, + 39, 40, 41, 42, 158, 159, 508, 461, 288, 289, + 290, 291, 303, 304, 305, 306, 520, 715, 352, 353, + 354, 355, 356, 357, 363, 364, 412, 697, 715, 715, + 715, 415, 434, 428, 428, 428, 428, 428, 428, 428, + 428, 428, 428, 428, 428, 428, 428, 428, 428, 428, + 428, 3, 3, 436, 424, 424, 185, 186, 341, 185, + 186, 341, 397, 434, 3, 4, 3, 4, 3, 3, + 428, 4, 3, 4, 424, 424, 424, 424, 424, 424, + 434, 40, 96, 97, 98, 425, 424, 715, 434, 424, + 424, 424, 424, 424, 424, 434, 427, 4, 715, 434, + 427, 425, 481, 484, 485, 4, 427, 427, 427, 427, + 427, 427, 427, 428, 428, 428, 428, 428, 428, 4, 43, 46, 59, 249, 250, 251, 252, 253, 254, 256, - 257, 258, 259, 462, 423, 423, 423, 423, 423, 3, - 3, 3, 4, 422, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 4, 422, 422, 422, 422, 420, 420, - 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, - 420, 420, 420, 420, 420, 420, 547, 388, 556, 4, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 668, - 439, 573, 433, 603, 605, 710, 435, 659, 437, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 443, 441, - 422, 447, 423, 4, 3, 3, 446, 448, 449, 450, - 451, 452, 453, 454, 36, 37, 38, 157, 36, 37, - 157, 710, 710, 419, 419, 446, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 423, 423, 423, 423, 4, - 420, 420, 420, 68, 292, 420, 522, 524, 526, 446, - 457, 419, 419, 419, 419, 419, 710, 419, 419, 420, - 446, 458, 460, 461, 459, 424, 424, 424, 424, 424, - 424, 424, 424, 424, 424, 424, 424, 424, 422, 424, - 424, 424, 424, 160, 549, 3, 4, 429, 563, 564, - 566, 565, 567, 569, 568, 571, 570, 60, 61, 62, - 63, 160, 670, 429, 60, 61, 63, 65, 160, 575, - 429, 22, 61, 73, 74, 75, 76, 77, 161, 162, + 257, 258, 259, 467, 428, 428, 428, 428, 428, 3, + 3, 3, 4, 427, 428, 428, 428, 428, 428, 428, + 428, 428, 428, 4, 427, 427, 427, 427, 425, 425, + 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 425, 425, 425, 425, 552, 391, 561, 4, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 673, + 444, 578, 438, 608, 610, 715, 440, 664, 442, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 448, 446, + 427, 452, 428, 4, 3, 3, 451, 453, 454, 455, + 456, 457, 458, 459, 36, 37, 38, 157, 36, 37, + 157, 715, 715, 424, 424, 451, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 428, 428, 428, 428, 4, + 425, 425, 425, 68, 292, 425, 527, 529, 531, 451, + 462, 424, 424, 424, 424, 424, 715, 424, 424, 425, + 451, 463, 465, 466, 464, 429, 429, 429, 429, 429, + 429, 429, 429, 429, 429, 429, 429, 429, 427, 429, + 429, 429, 429, 160, 554, 3, 4, 434, 568, 569, + 571, 570, 572, 574, 573, 576, 575, 60, 61, 62, + 63, 160, 675, 434, 60, 61, 63, 65, 160, 580, + 434, 22, 61, 73, 74, 75, 76, 77, 161, 162, 163, 260, 261, 262, 265, 268, 269, 270, 271, 272, - 344, 345, 346, 347, 403, 411, 613, 419, 608, 422, - 429, 61, 62, 63, 661, 429, 679, 680, 681, 682, - 683, 684, 704, 703, 705, 706, 707, 708, 709, 686, - 687, 688, 689, 690, 691, 442, 429, 445, 446, 420, - 446, 15, 16, 17, 18, 19, 246, 382, 481, 481, - 446, 446, 446, 446, 446, 446, 446, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 463, 464, - 465, 466, 467, 468, 469, 470, 471, 710, 710, 420, - 710, 446, 422, 422, 422, 422, 422, 422, 104, 593, - 593, 593, 446, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 446, 446, 446, 446, 420, 420, 420, 420, - 420, 420, 420, 420, 420, 420, 420, 420, 420, 543, - 420, 420, 420, 420, 3, 4, 557, 528, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 423, 423, 3, - 3, 423, 4, 423, 423, 3, 423, 423, 4, 423, - 423, 423, 423, 423, 3, 3, 423, 423, 423, 423, - 423, 3, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 4, 422, 4, 607, 423, 3, - 3, 4, 678, 678, 678, 678, 678, 678, 702, 702, - 702, 702, 702, 702, 702, 685, 685, 685, 685, 685, - 685, 444, 424, 423, 423, 423, 423, 3, 423, 423, - 4, 4, 504, 505, 506, 507, 510, 511, 512, 509, - 514, 508, 513, 462, 462, 462, 462, 462, 462, 462, - 462, 462, 422, 422, 422, 422, 516, 517, 518, 519, - 520, 521, 423, 4, 4, 4, 693, 694, 697, 698, - 699, 700, 695, 696, 701, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 528, 422, - 422, 422, 422, 550, 548, 20, 160, 559, 420, 419, - 674, 676, 420, 669, 420, 419, 580, 419, 420, 574, - 68, 69, 70, 71, 72, 642, 419, 710, 710, 419, - 618, 78, 79, 80, 81, 82, 308, 643, 710, 710, - 710, 419, 710, 67, 610, 98, 266, 267, 273, 420, - 420, 420, 420, 419, 710, 419, 710, 710, 710, 710, - 604, 609, 606, 602, 419, 663, 665, 660, 420, 710, - 420, 710, 420, 486, 710, 710, 478, 478, 503, 503, - 503, 503, 503, 503, 503, 503, 503, 503, 503, 472, - 473, 474, 475, 515, 515, 515, 515, 515, 515, 105, - 106, 107, 108, 109, 110, 111, 112, 523, 525, 527, - 692, 692, 692, 692, 692, 692, 692, 692, 692, 529, - 530, 531, 536, 537, 533, 532, 535, 534, 539, 538, - 541, 540, 542, 544, 545, 546, 20, 68, 191, 552, - 528, 423, 423, 4, 422, 422, 9, 83, 113, 114, + 347, 348, 349, 350, 406, 414, 618, 424, 613, 427, + 434, 61, 62, 63, 666, 434, 684, 685, 686, 687, + 688, 689, 709, 708, 710, 711, 712, 713, 714, 691, + 692, 693, 694, 695, 696, 447, 434, 450, 451, 425, + 451, 15, 16, 17, 18, 19, 246, 385, 486, 486, + 451, 451, 451, 451, 451, 451, 451, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 468, 469, + 470, 471, 472, 473, 474, 475, 476, 715, 715, 425, + 715, 451, 427, 427, 427, 427, 427, 427, 104, 598, + 598, 598, 451, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 451, 451, 451, 451, 425, 425, 425, 425, + 425, 425, 425, 425, 425, 425, 425, 425, 425, 548, + 425, 425, 425, 425, 3, 4, 562, 533, 567, 567, + 567, 567, 567, 567, 567, 567, 567, 428, 428, 3, + 3, 428, 4, 428, 428, 3, 428, 428, 4, 428, + 428, 428, 428, 428, 3, 3, 428, 428, 428, 428, + 428, 3, 428, 428, 428, 428, 428, 428, 428, 428, + 428, 428, 428, 428, 4, 427, 4, 612, 428, 3, + 3, 4, 683, 683, 683, 683, 683, 683, 707, 707, + 707, 707, 707, 707, 707, 690, 690, 690, 690, 690, + 690, 449, 429, 428, 428, 428, 428, 3, 428, 428, + 4, 4, 509, 510, 511, 512, 515, 516, 517, 514, + 519, 513, 518, 467, 467, 467, 467, 467, 467, 467, + 467, 467, 427, 427, 427, 427, 521, 522, 523, 524, + 525, 526, 428, 4, 4, 4, 698, 699, 702, 703, + 704, 705, 700, 701, 706, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 533, 427, + 427, 427, 427, 555, 553, 20, 160, 564, 425, 424, + 679, 681, 425, 674, 425, 424, 585, 424, 425, 579, + 68, 69, 70, 71, 72, 647, 424, 715, 715, 424, + 623, 78, 79, 80, 81, 82, 308, 648, 715, 715, + 715, 424, 715, 67, 615, 98, 266, 267, 273, 425, + 425, 425, 425, 424, 715, 424, 715, 715, 715, 715, + 609, 614, 611, 607, 424, 668, 670, 665, 425, 715, + 425, 715, 425, 491, 715, 715, 483, 483, 508, 508, + 508, 508, 508, 508, 508, 508, 508, 508, 508, 477, + 478, 479, 480, 520, 520, 520, 520, 520, 520, 105, + 106, 107, 108, 109, 110, 111, 112, 528, 530, 532, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 534, + 535, 536, 541, 542, 538, 537, 540, 539, 544, 543, + 546, 545, 547, 549, 550, 551, 20, 68, 191, 557, + 533, 428, 428, 4, 427, 427, 9, 83, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 214, 242, 263, 264, 276, 282, 293, 299, 300, - 301, 310, 311, 325, 331, 333, 365, 371, 373, 380, - 397, 410, 414, 416, 417, 418, 656, 711, 712, 729, - 731, 733, 735, 737, 741, 743, 745, 751, 773, 775, - 777, 779, 781, 783, 785, 787, 789, 791, 799, 806, - 808, 812, 816, 818, 823, 827, 836, 838, 840, 842, - 844, 857, 864, 871, 876, 882, 888, 895, 902, 906, - 922, 940, 942, 949, 981, 983, 985, 987, 997, 1004, - 1008, 1013, 1015, 1019, 1023, 1025, 1030, 1037, 1053, 1069, - 1071, 1078, 1080, 1084, 1086, 1088, 1090, 68, 103, 582, - 424, 667, 422, 422, 582, 422, 424, 572, 422, 422, - 422, 422, 422, 420, 640, 3, 3, 3, 3, 420, - 3, 4, 422, 422, 422, 422, 422, 3, 4, 422, - 422, 422, 422, 424, 424, 424, 424, 422, 422, 422, - 422, 422, 422, 422, 602, 608, 602, 422, 656, 582, - 658, 424, 422, 422, 422, 422, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 243, 244, 245, 355, 489, - 422, 422, 462, 462, 462, 462, 422, 422, 422, 422, - 422, 422, 422, 422, 515, 515, 515, 528, 528, 528, - 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, - 528, 528, 528, 528, 423, 423, 423, 4, 419, 420, - 558, 671, 672, 3, 3, 3, 3, 3, 3, 3, + 301, 310, 311, 325, 334, 336, 368, 374, 376, 383, + 400, 413, 417, 419, 420, 421, 423, 661, 716, 717, + 734, 736, 738, 740, 742, 746, 748, 750, 756, 779, + 781, 783, 785, 787, 789, 791, 793, 795, 797, 805, + 812, 814, 818, 822, 824, 829, 833, 842, 844, 846, + 848, 850, 863, 870, 877, 882, 888, 894, 901, 908, + 912, 928, 946, 948, 955, 987, 989, 991, 993, 1003, + 1010, 1014, 1019, 1021, 1025, 1029, 1031, 1036, 1046, 1062, + 1078, 1080, 1087, 1089, 1093, 1095, 1097, 1099, 1103, 68, + 103, 587, 429, 672, 427, 427, 587, 427, 429, 577, + 427, 427, 427, 427, 427, 425, 645, 3, 3, 3, + 3, 425, 3, 4, 427, 427, 427, 427, 427, 3, + 4, 427, 427, 427, 427, 429, 429, 429, 429, 427, + 427, 427, 427, 427, 427, 427, 607, 613, 607, 427, + 661, 587, 663, 429, 427, 427, 427, 427, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 243, 244, 245, + 358, 494, 427, 427, 467, 467, 467, 467, 427, 427, + 427, 427, 427, 427, 427, 427, 520, 520, 520, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, + 533, 533, 533, 533, 533, 533, 428, 428, 428, 4, + 424, 425, 563, 676, 677, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 4, 656, 3, 3, 4, 420, 576, - 577, 4, 579, 420, 614, 615, 617, 619, 616, 423, - 4, 644, 646, 648, 650, 3, 654, 613, 620, 621, - 622, 623, 624, 611, 613, 632, 630, 631, 633, 420, - 420, 420, 420, 629, 635, 634, 636, 637, 638, 639, - 662, 4, 4, 420, 482, 483, 484, 485, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 4, 487, 488, 594, 595, 596, 597, 598, 599, - 600, 601, 419, 420, 420, 551, 422, 422, 556, 670, - 670, 713, 657, 730, 732, 734, 736, 738, 742, 744, - 746, 752, 774, 776, 778, 780, 782, 784, 786, 788, - 790, 792, 800, 807, 809, 813, 817, 819, 824, 828, - 837, 839, 841, 843, 845, 858, 865, 872, 877, 883, - 889, 903, 907, 923, 941, 943, 950, 982, 984, 986, - 988, 998, 1009, 1014, 1016, 1020, 1024, 1026, 1031, 1038, - 1070, 1072, 1079, 1005, 1081, 896, 1054, 1085, 1087, 1089, - 1091, 675, 583, 587, 677, 422, 575, 575, 581, 575, - 422, 613, 613, 613, 613, 613, 420, 613, 656, 656, - 656, 656, 652, 20, 613, 613, 613, 613, 613, 613, - 613, 613, 613, 613, 422, 422, 422, 422, 613, 613, - 613, 613, 613, 613, 613, 661, 664, 666, 422, 481, - 481, 481, 481, 490, 491, 492, 493, 494, 495, 496, - 497, 498, 499, 500, 501, 502, 481, 481, 481, 593, - 593, 593, 593, 593, 593, 593, 593, 422, 424, 424, - 549, 561, 560, 164, 165, 166, 167, 170, 172, 173, - 274, 370, 379, 714, 4, 4, 4, 4, 4, 174, - 739, 4, 4, 175, 747, 178, 179, 180, 181, 182, - 183, 184, 187, 189, 398, 404, 753, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 72, 190, 793, 190, - 801, 4, 197, 810, 197, 814, 4, 190, 820, 199, - 825, 190, 200, 201, 829, 4, 4, 4, 4, 5, - 167, 170, 172, 183, 274, 846, 248, 286, 332, 363, - 859, 190, 866, 190, 873, 181, 183, 202, 878, 190, - 884, 166, 183, 203, 204, 890, 190, 904, 205, 206, - 908, 183, 190, 197, 314, 315, 319, 322, 323, 324, - 924, 4, 166, 183, 203, 204, 944, 22, 217, 224, - 225, 226, 227, 228, 229, 230, 231, 232, 236, 237, - 238, 239, 240, 241, 375, 951, 4, 4, 4, 183, - 277, 278, 279, 280, 281, 362, 989, 183, 283, 284, - 999, 294, 295, 1010, 4, 396, 1017, 302, 1021, 4, - 217, 312, 1027, 326, 1032, 43, 46, 59, 249, 250, - 251, 252, 253, 254, 256, 257, 258, 259, 1039, 4, - 190, 369, 1073, 4, 374, 1006, 415, 1082, 166, 183, - 203, 204, 897, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 243, 244, 245, 355, 1055, 4, 4, 4, - 375, 1092, 670, 102, 102, 670, 673, 575, 578, 422, - 4, 4, 4, 4, 656, 423, 4, 625, 626, 627, - 628, 661, 661, 477, 489, 489, 489, 489, 489, 489, - 489, 489, 489, 489, 489, 489, 489, 555, 420, 420, - 559, 559, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 4, 656, 423, 4, 423, 4, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 4, - 423, 423, 4, 423, 4, 423, 4, 423, 4, 423, - 4, 423, 4, 423, 423, 423, 4, 423, 423, 423, - 423, 423, 423, 4, 423, 423, 423, 423, 4, 423, - 4, 423, 4, 423, 423, 423, 4, 423, 4, 423, - 423, 423, 423, 4, 423, 4, 423, 423, 4, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 4, 423, - 423, 423, 423, 4, 423, 423, 423, 423, 423, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 423, 4, 423, 423, 423, 423, 423, 423, 423, - 4, 423, 423, 423, 4, 423, 423, 4, 423, 4, - 423, 4, 423, 423, 4, 423, 4, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 423, 423, 423, 423, - 4, 423, 423, 4, 423, 4, 423, 4, 423, 423, - 423, 423, 4, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 4, 423, 4, 423, - 423, 670, 575, 641, 645, 647, 649, 651, 4, 419, - 612, 613, 613, 613, 613, 476, 552, 422, 422, 419, - 710, 710, 33, 68, 168, 169, 171, 419, 710, 710, - 710, 710, 710, 420, 80, 176, 177, 710, 710, 710, - 710, 710, 710, 68, 185, 186, 68, 188, 710, 185, - 186, 399, 405, 406, 407, 408, 419, 191, 192, 193, - 194, 13, 14, 195, 196, 419, 419, 68, 198, 710, - 13, 14, 195, 196, 710, 710, 710, 33, 68, 168, - 169, 171, 419, 710, 710, 710, 710, 710, 710, 710, - 13, 14, 195, 196, 13, 14, 710, 710, 710, 400, - 401, 402, 710, 710, 710, 710, 419, 20, 21, 22, - 23, 24, 26, 27, 28, 243, 244, 207, 208, 209, - 710, 210, 211, 212, 213, 419, 419, 316, 317, 318, - 320, 321, 710, 710, 710, 710, 710, 710, 710, 215, - 216, 217, 218, 219, 220, 221, 222, 223, 376, 419, - 710, 710, 710, 710, 420, 419, 419, 419, 233, 234, - 235, 710, 710, 710, 710, 419, 419, 419, 710, 419, - 419, 419, 710, 710, 419, 710, 419, 191, 267, 419, - 710, 710, 419, 419, 710, 327, 328, 329, 330, 1040, - 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 710, 710, - 420, 710, 366, 367, 368, 420, 419, 710, 710, 710, - 710, 710, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, - 1064, 1065, 1066, 1067, 1068, 419, 419, 419, 640, 643, - 643, 643, 643, 653, 422, 610, 553, 554, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 1039, 1039, - 1039, 1039, 1039, 1039, 1039, 1039, 1039, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055, 1055, - 1055, 1055, 1055, 1055, 422, 422, 422, 643, 62, 552, - 552, 715, 716, 717, 718, 722, 719, 720, 721, 723, - 724, 725, 726, 727, 728, 740, 748, 749, 750, 754, - 755, 756, 757, 758, 759, 762, 760, 761, 763, 764, - 765, 768, 766, 767, 770, 771, 772, 769, 794, 795, - 796, 797, 798, 802, 803, 804, 805, 811, 815, 821, - 822, 826, 830, 831, 832, 833, 834, 835, 853, 847, - 851, 848, 849, 850, 852, 855, 854, 856, 860, 861, - 862, 863, 867, 868, 869, 870, 874, 875, 879, 881, - 880, 885, 886, 887, 893, 894, 891, 892, 905, 909, - 910, 914, 918, 915, 912, 911, 913, 916, 917, 919, - 920, 921, 925, 926, 927, 928, 929, 930, 931, 932, - 933, 934, 936, 935, 937, 938, 939, 947, 948, 945, - 946, 952, 953, 954, 955, 956, 957, 958, 959, 960, - 961, 967, 962, 963, 964, 965, 966, 968, 969, 970, - 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, - 990, 991, 992, 993, 994, 995, 996, 1000, 1001, 1002, - 1003, 1011, 1012, 1018, 1022, 1029, 1028, 1033, 1034, 1035, - 1036, 1049, 1050, 1051, 1052, 1074, 1075, 1076, 1077, 1007, - 1083, 900, 901, 898, 899, 1093, 584, 588, 3, 714, - 714, 714, 714, 714, 714, 714, 714, 714, 714, 714, - 714, 714, 714, 739, 747, 747, 747, 753, 753, 753, - 753, 753, 753, 753, 753, 753, 753, 753, 753, 753, - 753, 753, 753, 753, 753, 753, 793, 793, 793, 793, - 793, 801, 801, 801, 801, 810, 814, 820, 820, 825, - 829, 829, 829, 829, 829, 829, 846, 846, 846, 846, - 846, 846, 846, 846, 846, 846, 859, 859, 859, 859, - 866, 866, 866, 866, 873, 873, 878, 878, 878, 884, - 884, 884, 890, 890, 890, 890, 904, 908, 908, 908, - 908, 908, 908, 908, 908, 908, 908, 908, 908, 908, - 924, 924, 924, 924, 924, 924, 924, 924, 924, 924, - 924, 924, 924, 924, 924, 944, 944, 944, 944, 951, - 951, 951, 951, 951, 951, 951, 951, 951, 951, 951, - 951, 951, 951, 951, 951, 951, 951, 951, 951, 951, - 951, 951, 951, 951, 951, 951, 951, 951, 989, 989, - 989, 989, 989, 989, 989, 999, 999, 999, 999, 1010, - 1010, 1017, 1021, 1027, 1027, 1032, 1032, 1032, 1032, 1039, - 1039, 1039, 1039, 1073, 1073, 1073, 1073, 1006, 1082, 897, - 897, 897, 897, 1092, 593, 593, 656, 585, 589, 4, - 4, 102, 4, 586, 423, 655, 582, 419, 643, 422, - 590, 593, 591, 4, 592, 582 + 3, 3, 3, 3, 3, 3, 4, 661, 3, 3, + 4, 425, 581, 582, 4, 584, 425, 619, 620, 622, + 624, 621, 428, 4, 649, 651, 653, 655, 3, 659, + 618, 625, 626, 627, 628, 629, 616, 618, 637, 635, + 636, 638, 425, 425, 425, 425, 634, 640, 639, 641, + 642, 643, 644, 667, 4, 4, 425, 487, 488, 489, + 490, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 4, 492, 493, 599, 600, 601, + 602, 603, 604, 605, 606, 424, 425, 425, 556, 427, + 427, 561, 675, 675, 718, 662, 735, 737, 739, 741, + 743, 747, 749, 751, 757, 780, 782, 784, 786, 788, + 790, 792, 794, 796, 798, 806, 813, 815, 819, 823, + 825, 830, 834, 843, 845, 847, 849, 851, 864, 871, + 878, 883, 889, 895, 909, 913, 929, 947, 949, 956, + 988, 990, 992, 994, 1004, 1015, 1020, 1022, 1026, 1030, + 1032, 1037, 1047, 1079, 1081, 1088, 1011, 1090, 902, 1063, + 1094, 1096, 1098, 1100, 1104, 680, 588, 592, 682, 427, + 580, 580, 586, 580, 427, 618, 618, 618, 618, 618, + 425, 618, 661, 661, 661, 661, 657, 20, 618, 618, + 618, 618, 618, 618, 618, 618, 618, 618, 427, 427, + 427, 427, 618, 618, 618, 618, 618, 618, 618, 666, + 669, 671, 427, 486, 486, 486, 486, 495, 496, 497, + 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, + 486, 486, 486, 598, 598, 598, 598, 598, 598, 598, + 598, 427, 429, 429, 554, 566, 565, 164, 165, 166, + 167, 170, 172, 173, 274, 373, 382, 719, 4, 4, + 4, 4, 4, 174, 744, 4, 4, 175, 752, 178, + 179, 180, 181, 182, 183, 184, 187, 189, 401, 407, + 422, 758, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 72, 190, 799, 190, 807, 4, 197, 816, 197, + 820, 4, 190, 826, 199, 831, 190, 200, 201, 835, + 4, 4, 4, 4, 5, 167, 170, 172, 183, 274, + 852, 248, 286, 335, 366, 865, 190, 872, 190, 879, + 181, 183, 202, 884, 190, 890, 166, 183, 203, 204, + 896, 190, 910, 205, 206, 914, 183, 190, 197, 314, + 315, 319, 322, 323, 324, 930, 4, 166, 183, 203, + 204, 950, 22, 217, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 236, 237, 238, 239, 240, 241, 378, + 957, 4, 4, 4, 183, 277, 278, 279, 280, 281, + 365, 995, 183, 283, 284, 1005, 294, 295, 1016, 4, + 399, 1023, 302, 1027, 4, 217, 312, 1033, 326, 1038, + 43, 46, 59, 249, 250, 251, 252, 253, 254, 256, + 257, 258, 259, 1048, 4, 190, 372, 1082, 4, 377, + 1012, 418, 1091, 166, 183, 203, 204, 903, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 243, 244, 245, + 358, 1064, 4, 4, 4, 378, 1101, 4, 675, 102, + 102, 675, 678, 580, 583, 427, 4, 4, 4, 4, + 661, 428, 4, 630, 631, 632, 633, 666, 666, 482, + 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, + 494, 494, 494, 560, 425, 425, 564, 564, 428, 428, + 428, 428, 428, 428, 428, 428, 428, 428, 4, 661, + 428, 4, 428, 4, 428, 428, 428, 428, 428, 428, + 428, 428, 428, 428, 428, 428, 4, 428, 428, 4, + 428, 4, 428, 4, 428, 4, 428, 4, 428, 4, + 428, 428, 428, 4, 428, 428, 428, 428, 428, 428, + 4, 428, 428, 428, 428, 4, 428, 4, 428, 4, + 428, 428, 428, 4, 428, 4, 428, 428, 428, 428, + 4, 428, 4, 428, 428, 4, 428, 428, 428, 428, + 428, 428, 428, 428, 428, 4, 428, 428, 428, 428, + 4, 428, 428, 428, 428, 428, 428, 428, 428, 428, + 428, 428, 428, 428, 428, 428, 428, 428, 428, 4, + 428, 428, 428, 428, 428, 428, 428, 4, 428, 428, + 428, 4, 428, 428, 4, 428, 4, 428, 4, 428, + 428, 4, 428, 4, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 428, 428, 428, 428, 4, 428, 428, + 4, 428, 4, 428, 4, 428, 428, 428, 428, 4, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 4, 428, 4, 428, 428, 675, 580, + 646, 650, 652, 654, 656, 4, 424, 617, 618, 618, + 618, 618, 481, 557, 427, 427, 424, 715, 715, 33, + 68, 168, 169, 171, 424, 715, 715, 715, 715, 715, + 425, 80, 176, 177, 715, 715, 715, 715, 715, 715, + 68, 185, 186, 68, 188, 715, 185, 186, 402, 408, + 409, 410, 411, 715, 424, 191, 192, 193, 194, 13, + 14, 195, 196, 424, 424, 68, 198, 715, 13, 14, + 195, 196, 715, 715, 715, 33, 68, 168, 169, 171, + 424, 715, 715, 715, 715, 715, 715, 715, 13, 14, + 195, 196, 13, 14, 715, 715, 715, 403, 404, 405, + 715, 715, 715, 715, 424, 20, 21, 22, 23, 24, + 26, 27, 28, 243, 244, 207, 208, 209, 715, 210, + 211, 212, 213, 424, 424, 316, 317, 318, 320, 321, + 715, 715, 715, 715, 715, 715, 715, 215, 216, 217, + 218, 219, 220, 221, 222, 223, 379, 424, 715, 715, + 715, 715, 425, 424, 424, 424, 233, 234, 235, 715, + 715, 715, 715, 424, 424, 424, 715, 424, 424, 424, + 715, 715, 424, 715, 424, 191, 267, 424, 715, 715, + 424, 424, 715, 327, 328, 329, 330, 331, 332, 333, + 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 715, + 715, 425, 715, 369, 370, 371, 425, 424, 715, 715, + 715, 715, 715, 1065, 1066, 1067, 1068, 1069, 1070, 1071, + 1072, 1073, 1074, 1075, 1076, 1077, 424, 424, 424, 645, + 648, 648, 648, 648, 658, 427, 615, 558, 559, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 1048, 1048, 1048, 1048, 1048, 1048, 1048, + 1048, 1048, 427, 427, 427, 427, 427, 427, 427, 427, + 427, 427, 427, 427, 427, 427, 1064, 1064, 1064, 1064, + 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 427, + 427, 427, 648, 62, 557, 557, 720, 721, 722, 723, + 727, 724, 725, 726, 728, 729, 730, 731, 732, 733, + 745, 753, 754, 755, 759, 760, 761, 762, 763, 764, + 767, 765, 766, 768, 769, 770, 773, 771, 772, 775, + 776, 777, 774, 778, 800, 801, 802, 803, 804, 808, + 809, 810, 811, 817, 821, 827, 828, 832, 836, 837, + 838, 839, 840, 841, 859, 853, 857, 854, 855, 856, + 858, 861, 860, 862, 866, 867, 868, 869, 873, 874, + 875, 876, 880, 881, 885, 887, 886, 891, 892, 893, + 899, 900, 897, 898, 911, 915, 916, 920, 924, 921, + 918, 917, 919, 922, 923, 925, 926, 927, 931, 932, + 933, 934, 935, 936, 937, 938, 939, 940, 942, 941, + 943, 944, 945, 953, 954, 951, 952, 958, 959, 960, + 961, 962, 963, 964, 965, 966, 967, 973, 968, 969, + 970, 971, 972, 974, 975, 976, 977, 978, 979, 980, + 981, 982, 983, 984, 985, 986, 996, 997, 998, 999, + 1000, 1001, 1002, 1006, 1007, 1008, 1009, 1017, 1018, 1024, + 1028, 1035, 1034, 1039, 1040, 1041, 1042, 1043, 1044, 1045, + 1058, 1059, 1060, 1061, 1083, 1084, 1085, 1086, 1013, 1092, + 906, 907, 904, 905, 1102, 589, 593, 3, 719, 719, + 719, 719, 719, 719, 719, 719, 719, 719, 719, 719, + 719, 719, 744, 752, 752, 752, 758, 758, 758, 758, + 758, 758, 758, 758, 758, 758, 758, 758, 758, 758, + 758, 758, 758, 758, 758, 758, 799, 799, 799, 799, + 799, 807, 807, 807, 807, 816, 820, 826, 826, 831, + 835, 835, 835, 835, 835, 835, 852, 852, 852, 852, + 852, 852, 852, 852, 852, 852, 865, 865, 865, 865, + 872, 872, 872, 872, 879, 879, 884, 884, 884, 890, + 890, 890, 896, 896, 896, 896, 910, 914, 914, 914, + 914, 914, 914, 914, 914, 914, 914, 914, 914, 914, + 930, 930, 930, 930, 930, 930, 930, 930, 930, 930, + 930, 930, 930, 930, 930, 950, 950, 950, 950, 957, + 957, 957, 957, 957, 957, 957, 957, 957, 957, 957, + 957, 957, 957, 957, 957, 957, 957, 957, 957, 957, + 957, 957, 957, 957, 957, 957, 957, 957, 995, 995, + 995, 995, 995, 995, 995, 1005, 1005, 1005, 1005, 1016, + 1016, 1023, 1027, 1033, 1033, 1038, 1038, 1038, 1038, 1038, + 1038, 1038, 1048, 1048, 1048, 1048, 1082, 1082, 1082, 1082, + 1012, 1091, 903, 903, 903, 903, 1101, 598, 598, 661, + 590, 594, 4, 4, 102, 4, 591, 428, 660, 587, + 424, 648, 427, 595, 598, 596, 4, 597, 587 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ - -#define YYFAIL goto yyerrlab -#if defined YYFAIL - /* This is here to suppress warnings from the GCC cpp's - -Wunused-macros. Normally we don't worry about that warning, but - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - -/* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint16 yyr1[] = { - FILE *yyo = yyoutput; - YYUSE (yyo); - if (!yyvaluep) - return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ + 0, 430, 432, 433, 431, 434, 435, 436, 434, 434, + 437, 438, 434, 439, 440, 434, 441, 442, 434, 443, + 444, 434, 434, 434, 434, 434, 445, 446, 434, 434, + 448, 447, 447, 450, 449, 449, 452, 451, 453, 451, + 454, 451, 455, 451, 451, 456, 451, 457, 451, 458, + 451, 459, 451, 451, 460, 451, 461, 451, 451, 462, + 451, 463, 451, 464, 451, 465, 451, 466, 451, 451, + 451, 468, 467, 469, 467, 470, 467, 471, 467, 472, + 467, 473, 467, 474, 467, 475, 467, 476, 467, 477, + 467, 478, 467, 479, 467, 480, 467, 467, 482, 481, + 481, 484, 483, 485, 483, 483, 487, 486, 488, 486, + 489, 486, 490, 486, 491, 486, 492, 486, 493, 486, + 486, 495, 494, 496, 494, 497, 494, 498, 494, 499, + 494, 500, 494, 501, 494, 502, 494, 503, 494, 504, + 494, 505, 494, 506, 494, 507, 494, 494, 509, 508, + 510, 508, 511, 508, 512, 508, 513, 508, 514, 508, + 515, 508, 516, 508, 517, 508, 518, 508, 519, 508, + 508, 521, 520, 522, 520, 523, 520, 524, 520, 525, + 520, 526, 520, 527, 528, 520, 529, 530, 520, 531, + 532, 520, 520, 534, 533, 535, 533, 536, 533, 537, + 533, 538, 533, 539, 533, 540, 533, 541, 533, 542, + 533, 543, 533, 544, 533, 545, 533, 546, 533, 547, + 533, 548, 533, 549, 533, 550, 533, 551, 533, 552, + 553, 533, 533, 533, 555, 556, 554, 554, 558, 557, + 559, 557, 560, 557, 557, 562, 563, 561, 561, 565, + 564, 566, 564, 564, 568, 567, 569, 567, 570, 567, + 571, 567, 572, 567, 573, 567, 574, 567, 575, 567, + 576, 567, 567, 578, 579, 577, 577, 581, 580, 582, + 580, 583, 580, 584, 580, 585, 586, 580, 580, 588, + 589, 590, 591, 587, 592, 593, 594, 595, 596, 597, + 587, 587, 599, 598, 600, 598, 601, 598, 602, 598, + 603, 598, 604, 598, 605, 598, 606, 598, 598, 608, + 609, 607, 610, 611, 607, 612, 607, 607, 614, 613, + 613, 616, 617, 615, 615, 619, 618, 620, 618, 621, + 618, 622, 618, 623, 618, 624, 618, 625, 618, 626, + 618, 627, 618, 618, 628, 618, 629, 618, 618, 630, + 618, 631, 618, 632, 618, 633, 618, 634, 618, 635, + 618, 636, 618, 637, 618, 638, 618, 639, 618, 640, + 618, 641, 618, 642, 618, 643, 618, 644, 618, 618, + 646, 645, 645, 647, 647, 647, 647, 647, 649, 650, + 648, 651, 652, 648, 653, 654, 648, 655, 656, 648, + 657, 658, 648, 659, 660, 648, 648, 661, 661, 661, + 662, 664, 665, 663, 663, 667, 666, 668, 669, 666, + 670, 671, 666, 666, 673, 674, 672, 672, 676, 675, + 677, 675, 678, 675, 679, 680, 675, 681, 682, 675, + 675, 684, 683, 685, 683, 686, 683, 687, 683, 688, + 683, 689, 683, 683, 691, 690, 692, 690, 693, 690, + 694, 690, 695, 690, 696, 690, 690, 698, 697, 699, + 697, 700, 697, 701, 697, 702, 697, 703, 697, 704, + 697, 705, 697, 706, 697, 697, 708, 707, 709, 707, + 710, 707, 711, 707, 712, 707, 713, 707, 714, 707, + 707, 715, 715, 716, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 718, 717, 720, 719, 721, 719, 722, + 719, 723, 719, 724, 719, 725, 719, 726, 719, 727, + 719, 728, 719, 729, 719, 730, 719, 731, 719, 732, + 719, 733, 719, 719, 735, 734, 737, 736, 739, 738, + 741, 740, 743, 742, 745, 744, 744, 747, 746, 749, + 748, 751, 750, 753, 752, 754, 752, 755, 752, 752, + 757, 756, 759, 758, 760, 758, 761, 758, 762, 758, + 763, 758, 764, 758, 765, 758, 766, 758, 767, 758, + 768, 758, 769, 758, 770, 758, 771, 758, 772, 758, + 773, 758, 774, 758, 775, 758, 776, 758, 777, 758, + 778, 758, 758, 780, 779, 782, 781, 784, 783, 786, + 785, 788, 787, 790, 789, 792, 791, 794, 793, 796, + 795, 798, 797, 800, 799, 801, 799, 802, 799, 803, + 799, 804, 799, 799, 806, 805, 808, 807, 809, 807, + 810, 807, 811, 807, 807, 813, 812, 815, 814, 817, + 816, 816, 819, 818, 821, 820, 820, 823, 822, 825, + 824, 827, 826, 828, 826, 826, 830, 829, 832, 831, + 831, 834, 833, 836, 835, 837, 835, 838, 835, 839, + 835, 840, 835, 841, 835, 835, 843, 842, 845, 844, + 847, 846, 849, 848, 851, 850, 853, 852, 854, 852, + 855, 852, 856, 852, 857, 852, 858, 852, 859, 852, + 860, 852, 861, 852, 862, 852, 852, 864, 863, 866, + 865, 867, 865, 868, 865, 869, 865, 865, 871, 870, + 873, 872, 874, 872, 875, 872, 876, 872, 872, 878, + 877, 880, 879, 881, 879, 879, 883, 882, 885, 884, + 886, 884, 887, 884, 884, 889, 888, 891, 890, 892, + 890, 893, 890, 890, 895, 894, 897, 896, 898, 896, + 899, 896, 900, 896, 896, 902, 901, 904, 903, 905, + 903, 906, 903, 907, 903, 903, 909, 908, 911, 910, + 910, 913, 912, 915, 914, 916, 914, 917, 914, 918, + 914, 919, 914, 920, 914, 921, 914, 922, 914, 923, + 914, 924, 914, 925, 914, 926, 914, 927, 914, 914, + 929, 928, 931, 930, 932, 930, 933, 930, 934, 930, + 935, 930, 936, 930, 937, 930, 938, 930, 939, 930, + 940, 930, 941, 930, 942, 930, 943, 930, 944, 930, + 945, 930, 930, 947, 946, 949, 948, 951, 950, 952, + 950, 953, 950, 954, 950, 950, 956, 955, 958, 957, + 959, 957, 960, 957, 961, 957, 962, 957, 963, 957, + 964, 957, 965, 957, 966, 957, 967, 957, 968, 957, + 969, 957, 970, 957, 971, 957, 972, 957, 973, 957, + 974, 957, 975, 957, 976, 957, 977, 957, 978, 957, + 979, 957, 980, 957, 981, 957, 982, 957, 983, 957, + 984, 957, 985, 957, 986, 957, 957, 988, 987, 990, + 989, 992, 991, 994, 993, 996, 995, 997, 995, 998, + 995, 999, 995, 1000, 995, 1001, 995, 1002, 995, 995, + 1004, 1003, 1006, 1005, 1007, 1005, 1008, 1005, 1009, 1005, + 1005, 1011, 1010, 1013, 1012, 1012, 1015, 1014, 1017, 1016, + 1018, 1016, 1016, 1020, 1019, 1022, 1021, 1024, 1023, 1023, + 1026, 1025, 1028, 1027, 1027, 1030, 1029, 1032, 1031, 1034, + 1033, 1035, 1033, 1033, 1037, 1036, 1039, 1038, 1040, 1038, + 1041, 1038, 1042, 1038, 1043, 1038, 1044, 1038, 1045, 1038, + 1038, 1047, 1046, 1049, 1048, 1050, 1048, 1051, 1048, 1052, + 1048, 1053, 1048, 1054, 1048, 1055, 1048, 1056, 1048, 1057, + 1048, 1058, 1048, 1059, 1048, 1060, 1048, 1061, 1048, 1048, + 1063, 1062, 1065, 1064, 1066, 1064, 1067, 1064, 1068, 1064, + 1069, 1064, 1070, 1064, 1071, 1064, 1072, 1064, 1073, 1064, + 1074, 1064, 1075, 1064, 1076, 1064, 1077, 1064, 1064, 1079, + 1078, 1081, 1080, 1083, 1082, 1084, 1082, 1085, 1082, 1086, + 1082, 1082, 1088, 1087, 1090, 1089, 1092, 1091, 1091, 1094, + 1093, 1096, 1095, 1098, 1097, 1100, 1099, 1102, 1101, 1101, + 1104, 1103 +}; -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 0, 0, 10, 5, 0, 0, 7, 5, + 0, 0, 7, 0, 0, 7, 0, 0, 7, 0, + 0, 7, 5, 5, 5, 5, 0, 0, 7, 0, + 0, 4, 0, 0, 6, 0, 0, 6, 0, 6, + 0, 6, 0, 6, 5, 0, 6, 0, 6, 0, + 6, 0, 6, 5, 0, 6, 0, 6, 5, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 5, + 0, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 0, 10, + 0, 0, 6, 0, 6, 0, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 0, 7, 0, 0, 7, 0, + 0, 7, 0, 0, 8, 0, 8, 0, 8, 0, + 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, + 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, + 8, 0, 6, 0, 8, 0, 8, 0, 8, 0, + 0, 7, 5, 0, 0, 0, 7, 0, 0, 8, + 0, 8, 0, 6, 0, 0, 0, 7, 0, 0, + 6, 0, 6, 0, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 0, 0, 7, 0, 0, 6, 0, + 6, 0, 8, 0, 6, 0, 0, 7, 0, 0, + 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, + 20, 0, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 0, + 0, 7, 0, 0, 7, 0, 6, 0, 0, 4, + 0, 0, 0, 7, 0, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 5, 0, 6, 0, 6, 5, 0, + 8, 0, 8, 0, 8, 0, 8, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 0, 6, 0, 1, 1, 1, 1, 1, 0, 0, + 7, 0, 0, 7, 0, 0, 7, 0, 0, 7, + 0, 0, 8, 0, 0, 14, 0, 2, 5, 0, + 0, 0, 0, 7, 0, 0, 6, 0, 0, 7, + 0, 0, 7, 0, 0, 0, 7, 0, 0, 6, + 0, 6, 0, 8, 0, 0, 7, 0, 0, 7, + 0, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0, 5, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 0, 4, 0, 4, 0, 4, + 0, 4, 0, 5, 0, 6, 0, 0, 4, 0, + 4, 0, 5, 0, 6, 0, 6, 0, 6, 0, + 0, 5, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 5, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 0, 5, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 0, 4, 0, 5, 0, + 6, 0, 0, 5, 0, 6, 0, 0, 4, 0, + 5, 0, 6, 0, 6, 0, 0, 5, 0, 6, + 0, 0, 5, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 0, 4, 0, 4, + 0, 4, 0, 4, 0, 5, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 0, 5, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 0, 5, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 0, + 5, 0, 6, 0, 6, 0, 0, 5, 0, 6, + 0, 6, 0, 6, 0, 0, 5, 0, 6, 0, + 6, 0, 6, 0, 0, 5, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 0, 5, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 0, 5, 0, 6, + 0, 0, 5, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 0, 5, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 0, 4, 0, 5, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 0, 5, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 0, 4, 0, + 4, 0, 4, 0, 5, 0, 6, 0, 6, 0, + 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 0, 5, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 0, 5, 0, 6, 0, 0, 5, 0, 6, + 0, 6, 0, 0, 4, 0, 5, 0, 6, 0, + 0, 5, 0, 6, 0, 0, 4, 0, 5, 0, + 6, 0, 6, 0, 0, 5, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, + 0, 0, 5, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 6, 0, 6, 0, 6, 0, 6, 0, + 0, 5, 0, 4, 0, 4, 0, 4, 0, 4, + 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, + 0, 4, 0, 4, 0, 4, 0, 4, 0, 0, + 4, 0, 5, 0, 6, 0, 6, 0, 6, 0, + 6, 0, 0, 4, 0, 5, 0, 6, 0, 0, + 4, 0, 4, 0, 4, 0, 5, 0, 6, 0, + 0, 4 +}; + + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (0) + +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 + + + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif + + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ + +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) { + FILE *yyo = yyoutput; + YYUSE (yyo); + if (!yyvaluep) + return; +# ifdef YYPRINT if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + YYUSE (yytype); +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +{ + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); yy_symbol_value_print (yyoutput, yytype, yyvaluep); YYFPRINTF (yyoutput, ")"); @@ -4341,16 +3787,8 @@ | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -4361,49 +3799,42 @@ YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -4417,7 +3848,7 @@ /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -4440,15 +3871,8 @@ # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -4464,16 +3888,8 @@ # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -4503,27 +3919,27 @@ char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -4546,11 +3962,11 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = YY_NULL; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -4558,10 +3974,6 @@ int yycount = 0; /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - - for details. YYERROR is fine as it does not invoke this - function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected @@ -4611,7 +4023,7 @@ } yyarg[yycount++] = yytname[yyx]; { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) return 2; @@ -4678,31 +4090,17 @@ | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif { YYUSE (yyvaluep); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -4711,18 +4109,8 @@ /* The lookahead symbol. */ int yychar; - -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); - +YYSTYPE yylval; /* Number of syntax errors so far. */ int yynerrs; @@ -4731,35 +4119,16 @@ | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { int yystate; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. + 'yyss': related to states. + 'yyvs': related to semantic values. Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -4827,23 +4196,23 @@ #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); - yyss = yyss1; - yyvs = yyvs1; + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -4851,22 +4220,22 @@ # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -4875,10 +4244,10 @@ yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -4907,7 +4276,7 @@ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (); } if (yychar <= YYEOF) @@ -4972,7 +4341,7 @@ yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -4986,40 +4355,39 @@ switch (yyn) { case 2: -/* Line 1792 of yacc.c */ -#line 320 "configparser.yy" +#line 322 "configparser.yy" /* yacc.c:1646 */ { lconfig_parseinit();} +#line 4361 "configparser.cc" /* yacc.c:1646 */ break; case 3: -/* Line 1792 of yacc.c */ -#line 320 "configparser.yy" - { lconfig->setLoadedVersion( (yyvsp[(3) - (8)].num), (yyvsp[(5) - (8)].num), (yyvsp[(7) - (8)].num) ); } +#line 322 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setLoadedVersion( (yyvsp[-5].num), (yyvsp[-3].num), (yyvsp[-1].num) ); } +#line 4367 "configparser.cc" /* yacc.c:1646 */ break; case 6: -/* Line 1792 of yacc.c */ -#line 324 "configparser.yy" +#line 326 "configparser.yy" /* yacc.c:1646 */ { lconfig_faces_list.clear(); } +#line 4373 "configparser.cc" /* yacc.c:1646 */ break; case 7: -/* Line 1792 of yacc.c */ -#line 325 "configparser.yy" +#line 327 "configparser.yy" /* yacc.c:1646 */ { lconfig->applyNewFacesFromList( lconfig_faces_list ); } +#line 4381 "configparser.cc" /* yacc.c:1646 */ break; case 10: -/* Line 1792 of yacc.c */ -#line 329 "configparser.yy" +#line 331 "configparser.yy" /* yacc.c:1646 */ { lconfig_listp = new List(); } +#line 4387 "configparser.cc" /* yacc.c:1646 */ break; case 11: -/* Line 1792 of yacc.c */ -#line 330 "configparser.yy" +#line 332 "configparser.yy" /* yacc.c:1646 */ { lconfig->setPaths( lconfig_listp ); lconfig_id = lconfig_listp->initEnum(); lconfig_p1 = (WCPath*)lconfig_listp->getFirstElement( lconfig_id ); @@ -5031,17 +4399,17 @@ delete lconfig_listp; lconfig_listp = NULL; } +#line 4403 "configparser.cc" /* yacc.c:1646 */ break; case 13: -/* Line 1792 of yacc.c */ -#line 341 "configparser.yy" +#line 343 "configparser.yy" /* yacc.c:1646 */ { lconfig_listft = new List(); } +#line 4409 "configparser.cc" /* yacc.c:1646 */ break; case 14: -/* Line 1792 of yacc.c */ -#line 342 "configparser.yy" +#line 344 "configparser.yy" /* yacc.c:1646 */ { lconfig->setFiletypes( lconfig_listft ); lconfig_id = lconfig_listft->initEnum(); lconfig_ft1 = (WCFiletype*)lconfig_listft->getFirstElement( lconfig_id ); @@ -5053,17 +4421,17 @@ delete lconfig_listft; lconfig_listft = NULL; } +#line 4425 "configparser.cc" /* yacc.c:1646 */ break; case 16: -/* Line 1792 of yacc.c */ -#line 353 "configparser.yy" +#line 355 "configparser.yy" /* yacc.c:1646 */ { lconfig_listh = new List(); } +#line 4431 "configparser.cc" /* yacc.c:1646 */ break; case 17: -/* Line 1792 of yacc.c */ -#line 354 "configparser.yy" +#line 356 "configparser.yy" /* yacc.c:1646 */ { lconfig->setHotkeys( lconfig_listh ); lconfig_id = lconfig_listh->initEnum(); lconfig_hk1 = (WCHotkey*)lconfig_listh->getFirstElement( lconfig_id ); @@ -5075,17 +4443,17 @@ delete lconfig_listh; lconfig_listh = NULL; } +#line 4447 "configparser.cc" /* yacc.c:1646 */ break; case 19: -/* Line 1792 of yacc.c */ -#line 365 "configparser.yy" +#line 367 "configparser.yy" /* yacc.c:1646 */ { lconfig_listb = new List(); } +#line 4453 "configparser.cc" /* yacc.c:1646 */ break; case 20: -/* Line 1792 of yacc.c */ -#line 366 "configparser.yy" +#line 368 "configparser.yy" /* yacc.c:1646 */ { lconfig->setButtons( lconfig_listb ); lconfig_id = lconfig_listb->initEnum(); lconfig_bt1 = (WCButton*)lconfig_listb->getFirstElement( lconfig_id ); @@ -5097,628 +4465,628 @@ delete lconfig_listb; lconfig_listb = NULL; } +#line 4469 "configparser.cc" /* yacc.c:1646 */ break; case 26: -/* Line 1792 of yacc.c */ -#line 381 "configparser.yy" +#line 383 "configparser.yy" /* yacc.c:1646 */ { lconfig_pathjump_allow.clear(); } +#line 4475 "configparser.cc" /* yacc.c:1646 */ break; case 27: -/* Line 1792 of yacc.c */ -#line 382 "configparser.yy" +#line 384 "configparser.yy" /* yacc.c:1646 */ { lconfig->setPathJumpAllowDirs( lconfig_pathjump_allow ); lconfig_pathjump_allow.clear(); } +#line 4483 "configparser.cc" /* yacc.c:1646 */ break; case 30: -/* Line 1792 of yacc.c */ -#line 387 "configparser.yy" - { lconfig_pathjump_allow.push_back( (yyvsp[(1) - (2)].strptr) ); } +#line 389 "configparser.yy" /* yacc.c:1646 */ + { lconfig_pathjump_allow.push_back( (yyvsp[-1].strptr) ); } +#line 4489 "configparser.cc" /* yacc.c:1646 */ break; case 33: -/* Line 1792 of yacc.c */ -#line 390 "configparser.yy" - { lconfig->setPathJumpStoreFilesAlways( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 392 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setPathJumpStoreFilesAlways( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4495 "configparser.cc" /* yacc.c:1646 */ break; case 36: -/* Line 1792 of yacc.c */ -#line 393 "configparser.yy" - { lconfig->setLang( (yyvsp[(3) - (4)].strptr) ); } +#line 395 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setLang( (yyvsp[-1].strptr) ); } +#line 4501 "configparser.cc" /* yacc.c:1646 */ break; case 38: -/* Line 1792 of yacc.c */ -#line 394 "configparser.yy" - { lconfig->setRows( (yyvsp[(3) - (4)].num) ); } +#line 396 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setRows( (yyvsp[-1].num) ); } +#line 4507 "configparser.cc" /* yacc.c:1646 */ break; case 40: -/* Line 1792 of yacc.c */ -#line 395 "configparser.yy" - { lconfig->setColumns( (yyvsp[(3) - (4)].num) ); } +#line 397 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setColumns( (yyvsp[-1].num) ); } +#line 4513 "configparser.cc" /* yacc.c:1646 */ break; case 42: -/* Line 1792 of yacc.c */ -#line 396 "configparser.yy" - { lconfig->setCacheSize( (yyvsp[(3) - (4)].num) ); } +#line 398 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setCacheSize( (yyvsp[-1].num) ); } +#line 4519 "configparser.cc" /* yacc.c:1646 */ break; case 45: -/* Line 1792 of yacc.c */ -#line 398 "configparser.yy" +#line 400 "configparser.yy" /* yacc.c:1646 */ { lconfig->setOwnerstringtype( 0 ); } +#line 4525 "configparser.cc" /* yacc.c:1646 */ break; case 47: -/* Line 1792 of yacc.c */ -#line 399 "configparser.yy" +#line 401 "configparser.yy" /* yacc.c:1646 */ { lconfig->setOwnerstringtype( 1 ); } +#line 4531 "configparser.cc" /* yacc.c:1646 */ break; case 49: -/* Line 1792 of yacc.c */ -#line 400 "configparser.yy" - { lconfig->setTerminalBin( (yyvsp[(3) - (4)].strptr) ); } +#line 402 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setTerminalBin( (yyvsp[-1].strptr) ); } +#line 4537 "configparser.cc" /* yacc.c:1646 */ break; case 51: -/* Line 1792 of yacc.c */ -#line 401 "configparser.yy" - { lconfig->setShowStringForDirSize( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 403 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setShowStringForDirSize( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4543 "configparser.cc" /* yacc.c:1646 */ break; case 54: -/* Line 1792 of yacc.c */ -#line 404 "configparser.yy" +#line 406 "configparser.yy" /* yacc.c:1646 */ { lconfig->resetColors(); } +#line 4549 "configparser.cc" /* yacc.c:1646 */ break; case 56: -/* Line 1792 of yacc.c */ -#line 405 "configparser.yy" +#line 407 "configparser.yy" /* yacc.c:1646 */ { lconfig->clearLayoutOrders(); } +#line 4555 "configparser.cc" /* yacc.c:1646 */ break; case 59: -/* Line 1792 of yacc.c */ -#line 407 "configparser.yy" - { lconfig->setSaveWorkerStateOnExit( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 409 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setSaveWorkerStateOnExit( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4561 "configparser.cc" /* yacc.c:1646 */ break; case 61: -/* Line 1792 of yacc.c */ -#line 408 "configparser.yy" - { lconfig->setUseStringCompareMode( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? StringComparator::STRING_COMPARE_VERSION : StringComparator::STRING_COMPARE_REGULAR ); } +#line 410 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setUseStringCompareMode( ( ( (yyvsp[-1].num) ) == 1 ) ? StringComparator::STRING_COMPARE_VERSION : StringComparator::STRING_COMPARE_REGULAR ); } +#line 4567 "configparser.cc" /* yacc.c:1646 */ break; case 63: -/* Line 1792 of yacc.c */ -#line 409 "configparser.yy" +#line 411 "configparser.yy" /* yacc.c:1646 */ { lconfig->setUseStringCompareMode( StringComparator::STRING_COMPARE_NOCASE ); } +#line 4573 "configparser.cc" /* yacc.c:1646 */ break; case 65: -/* Line 1792 of yacc.c */ -#line 410 "configparser.yy" - { lconfig->setApplyWindowDialogType( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 412 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setApplyWindowDialogType( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4579 "configparser.cc" /* yacc.c:1646 */ break; case 67: -/* Line 1792 of yacc.c */ -#line 411 "configparser.yy" - { lconfig->setUseExtendedRegEx( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 413 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setUseExtendedRegEx( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4585 "configparser.cc" /* yacc.c:1646 */ break; case 71: -/* Line 1792 of yacc.c */ -#line 415 "configparser.yy" +#line 417 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_STATEBAR ); } +#line 4591 "configparser.cc" /* yacc.c:1646 */ break; case 73: -/* Line 1792 of yacc.c */ -#line 416 "configparser.yy" +#line 418 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_CLOCKBAR ); } +#line 4597 "configparser.cc" /* yacc.c:1646 */ break; case 75: -/* Line 1792 of yacc.c */ -#line 417 "configparser.yy" +#line 419 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_BUTTONS ); } +#line 4603 "configparser.cc" /* yacc.c:1646 */ break; case 77: -/* Line 1792 of yacc.c */ -#line 418 "configparser.yy" +#line 420 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_LISTVIEWS ); } +#line 4609 "configparser.cc" /* yacc.c:1646 */ break; case 79: -/* Line 1792 of yacc.c */ -#line 419 "configparser.yy" +#line 421 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_BLL ); } +#line 4615 "configparser.cc" /* yacc.c:1646 */ break; case 81: -/* Line 1792 of yacc.c */ -#line 420 "configparser.yy" +#line 422 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_LBL ); } +#line 4621 "configparser.cc" /* yacc.c:1646 */ break; case 83: -/* Line 1792 of yacc.c */ -#line 421 "configparser.yy" +#line 423 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_LLB ); } +#line 4627 "configparser.cc" /* yacc.c:1646 */ break; case 85: -/* Line 1792 of yacc.c */ -#line 422 "configparser.yy" +#line 424 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_BL ); } +#line 4633 "configparser.cc" /* yacc.c:1646 */ break; case 87: -/* Line 1792 of yacc.c */ -#line 423 "configparser.yy" +#line 425 "configparser.yy" /* yacc.c:1646 */ { lconfig->layoutAddEntry( LayoutSettings::LO_LB ); } +#line 4639 "configparser.cc" /* yacc.c:1646 */ break; case 89: -/* Line 1792 of yacc.c */ -#line 424 "configparser.yy" - { lconfig->setLayoutButtonVert( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 426 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setLayoutButtonVert( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4645 "configparser.cc" /* yacc.c:1646 */ break; case 91: -/* Line 1792 of yacc.c */ -#line 425 "configparser.yy" - { lconfig->setLayoutListviewVert( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 427 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setLayoutListviewVert( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4651 "configparser.cc" /* yacc.c:1646 */ break; case 93: -/* Line 1792 of yacc.c */ -#line 426 "configparser.yy" - { lconfig->setLayoutListViewWeight( (yyvsp[(3) - (4)].num) ); } +#line 428 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setLayoutListViewWeight( (yyvsp[-1].num) ); } +#line 4657 "configparser.cc" /* yacc.c:1646 */ break; case 95: -/* Line 1792 of yacc.c */ -#line 427 "configparser.yy" - { lconfig->setLayoutWeightRelToActive( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 429 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setLayoutWeightRelToActive( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4663 "configparser.cc" /* yacc.c:1646 */ break; case 98: -/* Line 1792 of yacc.c */ -#line 430 "configparser.yy" - { lconfig->setColor( (yyvsp[(1) - (8)].num), (yyvsp[(3) - (8)].num), (yyvsp[(5) - (8)].num), (yyvsp[(7) - (8)].num) ); } +#line 432 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setColor( (yyvsp[-7].num), (yyvsp[-5].num), (yyvsp[-3].num), (yyvsp[-1].num) ); } +#line 4669 "configparser.cc" /* yacc.c:1646 */ break; case 101: -/* Line 1792 of yacc.c */ -#line 433 "configparser.yy" +#line 435 "configparser.yy" /* yacc.c:1646 */ { lconfig_side = 0; } +#line 4675 "configparser.cc" /* yacc.c:1646 */ break; case 103: -/* Line 1792 of yacc.c */ -#line 434 "configparser.yy" +#line 436 "configparser.yy" /* yacc.c:1646 */ { lconfig_side = 1; } +#line 4681 "configparser.cc" /* yacc.c:1646 */ break; case 106: -/* Line 1792 of yacc.c */ -#line 437 "configparser.yy" - { lconfig->setHBarTop( lconfig_side, ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 439 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setHBarTop( lconfig_side, ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4687 "configparser.cc" /* yacc.c:1646 */ break; case 108: -/* Line 1792 of yacc.c */ -#line 438 "configparser.yy" - { lconfig->setHBarHeight( lconfig_side, (yyvsp[(3) - (4)].num) ); } +#line 440 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setHBarHeight( lconfig_side, (yyvsp[-1].num) ); } +#line 4693 "configparser.cc" /* yacc.c:1646 */ break; case 110: -/* Line 1792 of yacc.c */ -#line 439 "configparser.yy" - { lconfig->setVBarLeft( lconfig_side, ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 441 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setVBarLeft( lconfig_side, ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4699 "configparser.cc" /* yacc.c:1646 */ break; case 112: -/* Line 1792 of yacc.c */ -#line 440 "configparser.yy" - { lconfig->setVBarWidth( lconfig_side, (yyvsp[(3) - (4)].num) ); } +#line 442 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setVBarWidth( lconfig_side, (yyvsp[-1].num) ); } +#line 4705 "configparser.cc" /* yacc.c:1646 */ break; case 114: -/* Line 1792 of yacc.c */ -#line 441 "configparser.yy" +#line 443 "configparser.yy" /* yacc.c:1646 */ { lconfig->clearVisCols( lconfig_side ); } +#line 4711 "configparser.cc" /* yacc.c:1646 */ break; case 116: -/* Line 1792 of yacc.c */ -#line 442 "configparser.yy" - { lconfig->setShowHeader( lconfig_side, ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 444 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setShowHeader( lconfig_side, ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4717 "configparser.cc" /* yacc.c:1646 */ break; case 118: -/* Line 1792 of yacc.c */ -#line 443 "configparser.yy" - { lconfig->setPathEntryOnTop( lconfig_side, ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 445 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setPathEntryOnTop( lconfig_side, ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4723 "configparser.cc" /* yacc.c:1646 */ break; case 121: -/* Line 1792 of yacc.c */ -#line 446 "configparser.yy" +#line 448 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_NAME ); } +#line 4729 "configparser.cc" /* yacc.c:1646 */ break; case 123: -/* Line 1792 of yacc.c */ -#line 447 "configparser.yy" +#line 449 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_SIZE ); } +#line 4735 "configparser.cc" /* yacc.c:1646 */ break; case 125: -/* Line 1792 of yacc.c */ -#line 448 "configparser.yy" +#line 450 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_TYPE ); } +#line 4741 "configparser.cc" /* yacc.c:1646 */ break; case 127: -/* Line 1792 of yacc.c */ -#line 449 "configparser.yy" +#line 451 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_PERM ); } +#line 4747 "configparser.cc" /* yacc.c:1646 */ break; case 129: -/* Line 1792 of yacc.c */ -#line 450 "configparser.yy" +#line 452 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_OWNER ); } +#line 4753 "configparser.cc" /* yacc.c:1646 */ break; case 131: -/* Line 1792 of yacc.c */ -#line 451 "configparser.yy" +#line 453 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_DEST ); } +#line 4759 "configparser.cc" /* yacc.c:1646 */ break; case 133: -/* Line 1792 of yacc.c */ -#line 452 "configparser.yy" +#line 454 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_MOD ); } +#line 4765 "configparser.cc" /* yacc.c:1646 */ break; case 135: -/* Line 1792 of yacc.c */ -#line 453 "configparser.yy" +#line 455 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_ACC ); } +#line 4771 "configparser.cc" /* yacc.c:1646 */ break; case 137: -/* Line 1792 of yacc.c */ -#line 454 "configparser.yy" +#line 456 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_CHANGE ); } +#line 4777 "configparser.cc" /* yacc.c:1646 */ break; case 139: -/* Line 1792 of yacc.c */ -#line 455 "configparser.yy" +#line 457 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_INODE ); } +#line 4783 "configparser.cc" /* yacc.c:1646 */ break; case 141: -/* Line 1792 of yacc.c */ -#line 456 "configparser.yy" +#line 458 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_NLINK ); } +#line 4789 "configparser.cc" /* yacc.c:1646 */ break; case 143: -/* Line 1792 of yacc.c */ -#line 457 "configparser.yy" +#line 459 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_BLOCKS ); } +#line 4795 "configparser.cc" /* yacc.c:1646 */ break; case 145: -/* Line 1792 of yacc.c */ -#line 458 "configparser.yy" +#line 460 "configparser.yy" /* yacc.c:1646 */ { lconfig->addListCol( lconfig_side, WorkerTypes::LISTCOL_SIZEH ); } +#line 4801 "configparser.cc" /* yacc.c:1646 */ break; case 148: -/* Line 1792 of yacc.c */ -#line 461 "configparser.yy" +#line 463 "configparser.yy" /* yacc.c:1646 */ { lconfig->setDateFormat( 0 ); } +#line 4807 "configparser.cc" /* yacc.c:1646 */ break; case 150: -/* Line 1792 of yacc.c */ -#line 462 "configparser.yy" +#line 464 "configparser.yy" /* yacc.c:1646 */ { lconfig->setDateFormat( 1 ); } +#line 4813 "configparser.cc" /* yacc.c:1646 */ break; case 152: -/* Line 1792 of yacc.c */ -#line 463 "configparser.yy" +#line 465 "configparser.yy" /* yacc.c:1646 */ { lconfig->setDateFormat( 2 ); } +#line 4819 "configparser.cc" /* yacc.c:1646 */ break; case 154: -/* Line 1792 of yacc.c */ -#line 464 "configparser.yy" +#line 466 "configparser.yy" /* yacc.c:1646 */ { lconfig->setDateFormat( -1 ); } +#line 4825 "configparser.cc" /* yacc.c:1646 */ break; case 156: -/* Line 1792 of yacc.c */ -#line 465 "configparser.yy" - { lconfig->setDateFormatString( (yyvsp[(3) - (4)].strptr) ); } +#line 467 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setDateFormatString( (yyvsp[-1].strptr) ); } +#line 4831 "configparser.cc" /* yacc.c:1646 */ break; case 158: -/* Line 1792 of yacc.c */ -#line 466 "configparser.yy" - { lconfig->setDateSubst( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 468 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setDateSubst( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4837 "configparser.cc" /* yacc.c:1646 */ break; case 160: -/* Line 1792 of yacc.c */ -#line 467 "configparser.yy" +#line 469 "configparser.yy" /* yacc.c:1646 */ { lconfig->setTimeFormat( 0 ); } +#line 4843 "configparser.cc" /* yacc.c:1646 */ break; case 162: -/* Line 1792 of yacc.c */ -#line 468 "configparser.yy" +#line 470 "configparser.yy" /* yacc.c:1646 */ { lconfig->setTimeFormat( 1 ); } +#line 4849 "configparser.cc" /* yacc.c:1646 */ break; case 164: -/* Line 1792 of yacc.c */ -#line 469 "configparser.yy" +#line 471 "configparser.yy" /* yacc.c:1646 */ { lconfig->setTimeFormat( -1 ); } +#line 4855 "configparser.cc" /* yacc.c:1646 */ break; case 166: -/* Line 1792 of yacc.c */ -#line 470 "configparser.yy" - { lconfig->setTimeFormatString( (yyvsp[(3) - (4)].strptr) ); } +#line 472 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setTimeFormatString( (yyvsp[-1].strptr) ); } +#line 4861 "configparser.cc" /* yacc.c:1646 */ break; case 168: -/* Line 1792 of yacc.c */ -#line 471 "configparser.yy" - { lconfig->setDateBeforeTime( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 473 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setDateBeforeTime( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 4867 "configparser.cc" /* yacc.c:1646 */ break; case 171: -/* Line 1792 of yacc.c */ -#line 474 "configparser.yy" - { lconfig->setMouseSelectButton( (yyvsp[(3) - (4)].num) ); } +#line 476 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setMouseSelectButton( (yyvsp[-1].num) ); } +#line 4873 "configparser.cc" /* yacc.c:1646 */ break; case 173: -/* Line 1792 of yacc.c */ -#line 475 "configparser.yy" - { lconfig->setMouseActivateButton( (yyvsp[(3) - (4)].num) ); } +#line 477 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setMouseActivateButton( (yyvsp[-1].num) ); } +#line 4879 "configparser.cc" /* yacc.c:1646 */ break; case 175: -/* Line 1792 of yacc.c */ -#line 476 "configparser.yy" - { lconfig->setMouseScrollButton( (yyvsp[(3) - (4)].num) ); } +#line 478 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setMouseScrollButton( (yyvsp[-1].num) ); } +#line 4885 "configparser.cc" /* yacc.c:1646 */ break; case 177: -/* Line 1792 of yacc.c */ -#line 477 "configparser.yy" +#line 479 "configparser.yy" /* yacc.c:1646 */ { lconfig->setMouseSelectMethod( WConfig::MOUSECONF_NORMAL_MODE ); } +#line 4891 "configparser.cc" /* yacc.c:1646 */ break; case 179: -/* Line 1792 of yacc.c */ -#line 478 "configparser.yy" +#line 480 "configparser.yy" /* yacc.c:1646 */ { lconfig->setMouseSelectMethod( WConfig::MOUSECONF_ALT_MODE ); } +#line 4897 "configparser.cc" /* yacc.c:1646 */ break; case 181: -/* Line 1792 of yacc.c */ -#line 479 "configparser.yy" - { lconfig->setMouseContextButton( (yyvsp[(3) - (4)].num) ); } +#line 481 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setMouseContextButton( (yyvsp[-1].num) ); } +#line 4903 "configparser.cc" /* yacc.c:1646 */ break; case 183: -/* Line 1792 of yacc.c */ -#line 480 "configparser.yy" +#line 482 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod = 0; } +#line 4909 "configparser.cc" /* yacc.c:1646 */ break; case 184: -/* Line 1792 of yacc.c */ -#line 481 "configparser.yy" +#line 483 "configparser.yy" /* yacc.c:1646 */ { lconfig->setMouseActivateMod( lconfig_keymod ); } +#line 4915 "configparser.cc" /* yacc.c:1646 */ break; case 186: -/* Line 1792 of yacc.c */ -#line 482 "configparser.yy" +#line 484 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod = 0; } +#line 4921 "configparser.cc" /* yacc.c:1646 */ break; case 187: -/* Line 1792 of yacc.c */ -#line 483 "configparser.yy" +#line 485 "configparser.yy" /* yacc.c:1646 */ { lconfig->setMouseScrollMod( lconfig_keymod ); } +#line 4927 "configparser.cc" /* yacc.c:1646 */ break; case 189: -/* Line 1792 of yacc.c */ -#line 484 "configparser.yy" +#line 486 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod = 0; } +#line 4933 "configparser.cc" /* yacc.c:1646 */ break; case 190: -/* Line 1792 of yacc.c */ -#line 485 "configparser.yy" +#line 487 "configparser.yy" /* yacc.c:1646 */ { lconfig->setMouseContextMod( lconfig_keymod ); } +#line 4939 "configparser.cc" /* yacc.c:1646 */ break; case 193: -/* Line 1792 of yacc.c */ -#line 488 "configparser.yy" - { lconfig->setStatusbar( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setStatusbar( 1, (yyvsp[(5) - (6)].num) ); } +#line 490 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setStatusbar( 0, (yyvsp[-3].num) ); + lconfig->setStatusbar( 1, (yyvsp[-1].num) ); } +#line 4946 "configparser.cc" /* yacc.c:1646 */ break; case 195: -/* Line 1792 of yacc.c */ -#line 490 "configparser.yy" - { lconfig->setSelLVB( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setSelLVB( 1, (yyvsp[(5) - (6)].num) ); } +#line 492 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setSelLVB( 0, (yyvsp[-3].num) ); + lconfig->setSelLVB( 1, (yyvsp[-1].num) ); } +#line 4953 "configparser.cc" /* yacc.c:1646 */ break; case 197: -/* Line 1792 of yacc.c */ -#line 492 "configparser.yy" - { lconfig->setUnselLVB( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setUnselLVB( 1, (yyvsp[(5) - (6)].num) ); } +#line 494 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setUnselLVB( 0, (yyvsp[-3].num) ); + lconfig->setUnselLVB( 1, (yyvsp[-1].num) ); } +#line 4960 "configparser.cc" /* yacc.c:1646 */ break; case 199: -/* Line 1792 of yacc.c */ -#line 494 "configparser.yy" - { lconfig->setSelDir( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setSelDir( 1, (yyvsp[(5) - (6)].num) ); } +#line 496 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setSelDir( 0, (yyvsp[-3].num) ); + lconfig->setSelDir( 1, (yyvsp[-1].num) ); } +#line 4967 "configparser.cc" /* yacc.c:1646 */ break; case 201: -/* Line 1792 of yacc.c */ -#line 496 "configparser.yy" - { lconfig->setUnselDir( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setUnselDir( 1, (yyvsp[(5) - (6)].num) ); } +#line 498 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setUnselDir( 0, (yyvsp[-3].num) ); + lconfig->setUnselDir( 1, (yyvsp[-1].num) ); } +#line 4974 "configparser.cc" /* yacc.c:1646 */ break; case 203: -/* Line 1792 of yacc.c */ -#line 498 "configparser.yy" - { lconfig->setSelFile( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setSelFile( 1, (yyvsp[(5) - (6)].num) ); } +#line 500 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setSelFile( 0, (yyvsp[-3].num) ); + lconfig->setSelFile( 1, (yyvsp[-1].num) ); } +#line 4981 "configparser.cc" /* yacc.c:1646 */ break; case 205: -/* Line 1792 of yacc.c */ -#line 500 "configparser.yy" - { lconfig->setUnselFile( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setUnselFile( 1, (yyvsp[(5) - (6)].num) ); } +#line 502 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setUnselFile( 0, (yyvsp[-3].num) ); + lconfig->setUnselFile( 1, (yyvsp[-1].num) ); } +#line 4988 "configparser.cc" /* yacc.c:1646 */ break; case 207: -/* Line 1792 of yacc.c */ -#line 502 "configparser.yy" - { lconfig->setClockbar( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setClockbar( 1, (yyvsp[(5) - (6)].num) ); } +#line 504 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setClockbar( 0, (yyvsp[-3].num) ); + lconfig->setClockbar( 1, (yyvsp[-1].num) ); } +#line 4995 "configparser.cc" /* yacc.c:1646 */ break; case 209: -/* Line 1792 of yacc.c */ -#line 504 "configparser.yy" - { lconfig->setRequest( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setRequest( 1, (yyvsp[(5) - (6)].num) ); } +#line 506 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setRequest( 0, (yyvsp[-3].num) ); + lconfig->setRequest( 1, (yyvsp[-1].num) ); } +#line 5002 "configparser.cc" /* yacc.c:1646 */ break; case 211: -/* Line 1792 of yacc.c */ -#line 506 "configparser.yy" - { lconfig->setSelDirAct( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setSelDirAct( 1, (yyvsp[(5) - (6)].num) ); } +#line 508 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setSelDirAct( 0, (yyvsp[-3].num) ); + lconfig->setSelDirAct( 1, (yyvsp[-1].num) ); } +#line 5009 "configparser.cc" /* yacc.c:1646 */ break; case 213: -/* Line 1792 of yacc.c */ -#line 508 "configparser.yy" - { lconfig->setUnselDirAct( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setUnselDirAct( 1, (yyvsp[(5) - (6)].num) ); } +#line 510 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setUnselDirAct( 0, (yyvsp[-3].num) ); + lconfig->setUnselDirAct( 1, (yyvsp[-1].num) ); } +#line 5016 "configparser.cc" /* yacc.c:1646 */ break; case 215: -/* Line 1792 of yacc.c */ -#line 510 "configparser.yy" - { lconfig->setSelFileAct( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setSelFileAct( 1, (yyvsp[(5) - (6)].num) ); } +#line 512 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setSelFileAct( 0, (yyvsp[-3].num) ); + lconfig->setSelFileAct( 1, (yyvsp[-1].num) ); } +#line 5023 "configparser.cc" /* yacc.c:1646 */ break; case 217: -/* Line 1792 of yacc.c */ -#line 512 "configparser.yy" - { lconfig->setUnselFileAct( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setUnselFileAct( 1, (yyvsp[(5) - (6)].num) ); } +#line 514 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setUnselFileAct( 0, (yyvsp[-3].num) ); + lconfig->setUnselFileAct( 1, (yyvsp[-1].num) ); } +#line 5030 "configparser.cc" /* yacc.c:1646 */ break; case 219: -/* Line 1792 of yacc.c */ -#line 514 "configparser.yy" - { lconfig->setLVHeader( 0, (yyvsp[(3) - (6)].num) ); - lconfig->setLVHeader( 1, (yyvsp[(5) - (6)].num) ); } +#line 516 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setLVHeader( 0, (yyvsp[-3].num) ); + lconfig->setLVHeader( 1, (yyvsp[-1].num) ); } +#line 5037 "configparser.cc" /* yacc.c:1646 */ break; case 221: -/* Line 1792 of yacc.c */ -#line 516 "configparser.yy" - { lconfig->setListerBG( (yyvsp[(3) - (4)].num) ); } +#line 518 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setListerBG( (yyvsp[-1].num) ); } +#line 5043 "configparser.cc" /* yacc.c:1646 */ break; case 223: -/* Line 1792 of yacc.c */ -#line 517 "configparser.yy" +#line 519 "configparser.yy" /* yacc.c:1646 */ { - lconfig_faces_list.push_back( std::make_pair( "textview-fg", (yyvsp[(3) - (6)].num) ) ); - lconfig_faces_list.push_back( std::make_pair( "textview-bg", (yyvsp[(5) - (6)].num) ) ); + lconfig_faces_list.push_back( std::make_pair( "textview-fg", (yyvsp[-3].num) ) ); + lconfig_faces_list.push_back( std::make_pair( "textview-bg", (yyvsp[-1].num) ) ); } +#line 5052 "configparser.cc" /* yacc.c:1646 */ break; case 225: -/* Line 1792 of yacc.c */ -#line 521 "configparser.yy" +#line 523 "configparser.yy" /* yacc.c:1646 */ { - lconfig_faces_list.push_back( std::make_pair( "textview-highlight-fg", (yyvsp[(3) - (6)].num) ) ); - lconfig_faces_list.push_back( std::make_pair( "textview-highlight-bg", (yyvsp[(5) - (6)].num) ) ); + lconfig_faces_list.push_back( std::make_pair( "textview-highlight-fg", (yyvsp[-3].num) ) ); + lconfig_faces_list.push_back( std::make_pair( "textview-highlight-bg", (yyvsp[-1].num) ) ); } +#line 5061 "configparser.cc" /* yacc.c:1646 */ break; case 227: -/* Line 1792 of yacc.c */ -#line 525 "configparser.yy" +#line 527 "configparser.yy" /* yacc.c:1646 */ { - lconfig_faces_list.push_back( std::make_pair( "textview-selection-fg", (yyvsp[(3) - (6)].num) ) ); - lconfig_faces_list.push_back( std::make_pair( "textview-selection-bg", (yyvsp[(5) - (6)].num) ) ); + lconfig_faces_list.push_back( std::make_pair( "textview-selection-fg", (yyvsp[-3].num) ) ); + lconfig_faces_list.push_back( std::make_pair( "textview-selection-bg", (yyvsp[-1].num) ) ); } +#line 5070 "configparser.cc" /* yacc.c:1646 */ break; case 229: -/* Line 1792 of yacc.c */ -#line 529 "configparser.yy" +#line 531 "configparser.yy" /* yacc.c:1646 */ { lconfig_labelcolors.clear(); } +#line 5076 "configparser.cc" /* yacc.c:1646 */ break; case 230: -/* Line 1792 of yacc.c */ -#line 530 "configparser.yy" +#line 532 "configparser.yy" /* yacc.c:1646 */ { WConfig::ColorDef c = lconfig->getColorDefs(); c.setLabelColors( lconfig_labelcolors ); lconfig->setColorDefs( c ); } +#line 5086 "configparser.cc" /* yacc.c:1646 */ break; case 234: -/* Line 1792 of yacc.c */ -#line 539 "configparser.yy" +#line 541 "configparser.yy" /* yacc.c:1646 */ { lconfig_labelcolor.normal_fg = -1; lconfig_labelcolor.normal_bg = -1; @@ -5726,180 +5094,180 @@ lconfig_labelcolor.active_bg = -1; lconfig_labelcolor_name = ""; } +#line 5098 "configparser.cc" /* yacc.c:1646 */ break; case 235: -/* Line 1792 of yacc.c */ -#line 546 "configparser.yy" +#line 548 "configparser.yy" /* yacc.c:1646 */ { lconfig_labelcolors[lconfig_labelcolor_name] = lconfig_labelcolor; } +#line 5106 "configparser.cc" /* yacc.c:1646 */ break; case 238: -/* Line 1792 of yacc.c */ -#line 551 "configparser.yy" +#line 553 "configparser.yy" /* yacc.c:1646 */ { - lconfig_labelcolor.normal_fg = (yyvsp[(3) - (6)].num); - lconfig_labelcolor.normal_bg = (yyvsp[(5) - (6)].num); + lconfig_labelcolor.normal_fg = (yyvsp[-3].num); + lconfig_labelcolor.normal_bg = (yyvsp[-1].num); } +#line 5115 "configparser.cc" /* yacc.c:1646 */ break; case 240: -/* Line 1792 of yacc.c */ -#line 555 "configparser.yy" +#line 557 "configparser.yy" /* yacc.c:1646 */ { - lconfig_labelcolor.active_fg = (yyvsp[(3) - (6)].num); - lconfig_labelcolor.active_bg = (yyvsp[(5) - (6)].num); + lconfig_labelcolor.active_fg = (yyvsp[-3].num); + lconfig_labelcolor.active_bg = (yyvsp[-1].num); } +#line 5124 "configparser.cc" /* yacc.c:1646 */ break; case 242: -/* Line 1792 of yacc.c */ -#line 559 "configparser.yy" - { lconfig_labelcolor_name = (yyvsp[(3) - (4)].strptr); } +#line 561 "configparser.yy" /* yacc.c:1646 */ + { lconfig_labelcolor_name = (yyvsp[-1].strptr); } +#line 5130 "configparser.cc" /* yacc.c:1646 */ break; case 245: -/* Line 1792 of yacc.c */ -#line 562 "configparser.yy" +#line 564 "configparser.yy" /* yacc.c:1646 */ { lconfig_face_name.clear(); lconfig_face_color = -1; } +#line 5139 "configparser.cc" /* yacc.c:1646 */ break; case 246: -/* Line 1792 of yacc.c */ -#line 566 "configparser.yy" +#line 568 "configparser.yy" /* yacc.c:1646 */ { lconfig_faces_list.push_back( std::make_pair( lconfig_face_name, lconfig_face_color ) ); } +#line 5147 "configparser.cc" /* yacc.c:1646 */ break; case 249: -/* Line 1792 of yacc.c */ -#line 571 "configparser.yy" +#line 573 "configparser.yy" /* yacc.c:1646 */ { - lconfig_face_color = (yyvsp[(3) - (4)].num); + lconfig_face_color = (yyvsp[-1].num); } +#line 5155 "configparser.cc" /* yacc.c:1646 */ break; case 251: -/* Line 1792 of yacc.c */ -#line 574 "configparser.yy" - { lconfig_face_name = (yyvsp[(3) - (4)].strptr); } +#line 576 "configparser.yy" /* yacc.c:1646 */ + { lconfig_face_name = (yyvsp[-1].strptr); } +#line 5161 "configparser.cc" /* yacc.c:1646 */ break; case 254: -/* Line 1792 of yacc.c */ -#line 577 "configparser.yy" - { lconfig->setStartDir( 0, (yyvsp[(3) - (4)].strptr) ); } +#line 579 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setStartDir( 0, (yyvsp[-1].strptr) ); } +#line 5167 "configparser.cc" /* yacc.c:1646 */ break; case 256: -/* Line 1792 of yacc.c */ -#line 578 "configparser.yy" - { lconfig->setStartDir( 1, (yyvsp[(3) - (4)].strptr) ); } +#line 580 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setStartDir( 1, (yyvsp[-1].strptr) ); } +#line 5173 "configparser.cc" /* yacc.c:1646 */ break; case 258: -/* Line 1792 of yacc.c */ -#line 579 "configparser.yy" +#line 581 "configparser.yy" /* yacc.c:1646 */ { lconfig->setRestoreTabsMode( WConfig::RESTORE_TABS_NEVER ); } +#line 5179 "configparser.cc" /* yacc.c:1646 */ break; case 260: -/* Line 1792 of yacc.c */ -#line 580 "configparser.yy" +#line 582 "configparser.yy" /* yacc.c:1646 */ { lconfig->setRestoreTabsMode( WConfig::RESTORE_TABS_ALWAYS ); } +#line 5185 "configparser.cc" /* yacc.c:1646 */ break; case 262: -/* Line 1792 of yacc.c */ -#line 581 "configparser.yy" +#line 583 "configparser.yy" /* yacc.c:1646 */ { lconfig->setRestoreTabsMode( WConfig::RESTORE_TABS_ASK ); } +#line 5191 "configparser.cc" /* yacc.c:1646 */ break; case 264: -/* Line 1792 of yacc.c */ -#line 582 "configparser.yy" +#line 584 "configparser.yy" /* yacc.c:1646 */ { lconfig->setStoreTabsMode( WConfig::STORE_TABS_NEVER ); } +#line 5197 "configparser.cc" /* yacc.c:1646 */ break; case 266: -/* Line 1792 of yacc.c */ -#line 583 "configparser.yy" +#line 585 "configparser.yy" /* yacc.c:1646 */ { lconfig->setStoreTabsMode( WConfig::STORE_TABS_ALWAYS ); } +#line 5203 "configparser.cc" /* yacc.c:1646 */ break; case 268: -/* Line 1792 of yacc.c */ -#line 584 "configparser.yy" +#line 586 "configparser.yy" /* yacc.c:1646 */ { lconfig->setStoreTabsMode( WConfig::STORE_TABS_AS_EXIT_STATE ); } +#line 5209 "configparser.cc" /* yacc.c:1646 */ break; case 270: -/* Line 1792 of yacc.c */ -#line 585 "configparser.yy" +#line 587 "configparser.yy" /* yacc.c:1646 */ { lconfig->setStoreTabsMode( WConfig::STORE_TABS_ASK ); } +#line 5215 "configparser.cc" /* yacc.c:1646 */ break; case 273: -/* Line 1792 of yacc.c */ -#line 588 "configparser.yy" +#line 590 "configparser.yy" /* yacc.c:1646 */ { lconfig_p1 = new WCPath(); } +#line 5221 "configparser.cc" /* yacc.c:1646 */ break; case 274: -/* Line 1792 of yacc.c */ -#line 589 "configparser.yy" +#line 591 "configparser.yy" /* yacc.c:1646 */ { lconfig_p1->setCheck( true ); while ( lconfig_listp->size() < ( lconfig_pos + 1 ) ) lconfig_listp->addElement( new WCPath() ); lconfig_p1 = (WCPath*)lconfig_listp->exchangeElement( lconfig_pos, lconfig_p1 ); delete lconfig_p1; lconfig_p1 = NULL; } +#line 5232 "configparser.cc" /* yacc.c:1646 */ break; case 277: -/* Line 1792 of yacc.c */ -#line 597 "configparser.yy" - { lconfig_pos = (yyvsp[(3) - (4)].num); +#line 599 "configparser.yy" /* yacc.c:1646 */ + { lconfig_pos = (yyvsp[-1].num); if ( lconfig_pos < 0 ) lconfig_pos = 0; if ( lconfig_pos > 10240 ) lconfig_pos = 10240; } +#line 5241 "configparser.cc" /* yacc.c:1646 */ break; case 279: -/* Line 1792 of yacc.c */ -#line 601 "configparser.yy" - { lconfig_p1->setName( (yyvsp[(3) - (4)].strptr) ); } +#line 603 "configparser.yy" /* yacc.c:1646 */ + { lconfig_p1->setName( (yyvsp[-1].strptr) ); } +#line 5247 "configparser.cc" /* yacc.c:1646 */ break; case 281: -/* Line 1792 of yacc.c */ -#line 602 "configparser.yy" - { lconfig_p1->setFG( (yyvsp[(3) - (6)].num) ); - lconfig_p1->setBG( (yyvsp[(5) - (6)].num) ); +#line 604 "configparser.yy" /* yacc.c:1646 */ + { lconfig_p1->setFG( (yyvsp[-3].num) ); + lconfig_p1->setBG( (yyvsp[-1].num) ); } +#line 5255 "configparser.cc" /* yacc.c:1646 */ break; case 283: -/* Line 1792 of yacc.c */ -#line 605 "configparser.yy" - { lconfig_p1->setPath( (yyvsp[(3) - (4)].strptr) ); } +#line 607 "configparser.yy" /* yacc.c:1646 */ + { lconfig_p1->setPath( (yyvsp[-1].strptr) ); } +#line 5261 "configparser.cc" /* yacc.c:1646 */ break; case 285: -/* Line 1792 of yacc.c */ -#line 606 "configparser.yy" +#line 608 "configparser.yy" /* yacc.c:1646 */ { lconfig_listsk = new List(); } +#line 5267 "configparser.cc" /* yacc.c:1646 */ break; case 286: -/* Line 1792 of yacc.c */ -#line 607 "configparser.yy" +#line 609 "configparser.yy" /* yacc.c:1646 */ { lconfig_p1->setDoubleKeys( lconfig_listsk ); lconfig_id = lconfig_listsk->initEnum(); lconfig_dk = (WCDoubleShortkey*)lconfig_listsk->getFirstElement( lconfig_id ); @@ -5912,155 +5280,155 @@ delete lconfig_listsk; lconfig_listsk = NULL; } +#line 5284 "configparser.cc" /* yacc.c:1646 */ break; case 289: -/* Line 1792 of yacc.c */ -#line 621 "configparser.yy" +#line 623 "configparser.yy" /* yacc.c:1646 */ { lconfig_dk = new WCDoubleShortkey(); lconfig_dk->setType( WCDoubleShortkey::WCDS_NORMAL ); } +#line 5292 "configparser.cc" /* yacc.c:1646 */ break; case 290: -/* Line 1792 of yacc.c */ -#line 624 "configparser.yy" - { lconfig_nkeysym = AGUIX::getKeySymForString( (yyvsp[(6) - (7)].strptr) ); +#line 626 "configparser.yy" /* yacc.c:1646 */ + { lconfig_nkeysym = AGUIX::getKeySymForString( (yyvsp[-1].strptr) ); if ( lconfig_nkeysym != NoSymbol ) lconfig_dk->setKeySym( lconfig_nkeysym, 0 ); else lconfig_dk->setKeySym( 0, 0 ); /*TODO:Fehler printen?*/ lconfig_keymod = 0; } +#line 5302 "configparser.cc" /* yacc.c:1646 */ break; case 291: -/* Line 1792 of yacc.c */ -#line 629 "configparser.yy" +#line 631 "configparser.yy" /* yacc.c:1646 */ { lconfig_dk->setMod( lconfig_keymod, 0 ); } +#line 5308 "configparser.cc" /* yacc.c:1646 */ break; case 292: -/* Line 1792 of yacc.c */ -#line 630 "configparser.yy" +#line 632 "configparser.yy" /* yacc.c:1646 */ { lconfig_listsk->addElement( lconfig_dk ); } +#line 5314 "configparser.cc" /* yacc.c:1646 */ break; case 294: -/* Line 1792 of yacc.c */ -#line 632 "configparser.yy" +#line 634 "configparser.yy" /* yacc.c:1646 */ { lconfig_dk = new WCDoubleShortkey(); lconfig_dk->setType( WCDoubleShortkey::WCDS_DOUBLE ); } +#line 5322 "configparser.cc" /* yacc.c:1646 */ break; case 295: -/* Line 1792 of yacc.c */ -#line 635 "configparser.yy" - { lconfig_nkeysym = AGUIX::getKeySymForString( (yyvsp[(6) - (7)].strptr) ); +#line 637 "configparser.yy" /* yacc.c:1646 */ + { lconfig_nkeysym = AGUIX::getKeySymForString( (yyvsp[-1].strptr) ); if ( lconfig_nkeysym != NoSymbol ) lconfig_dk->setKeySym( lconfig_nkeysym, 0 ); else lconfig_dk->setKeySym( 0, 0 ); /*TODO:Fehler printen?*/ lconfig_keymod = 0; } +#line 5332 "configparser.cc" /* yacc.c:1646 */ break; case 296: -/* Line 1792 of yacc.c */ -#line 640 "configparser.yy" +#line 642 "configparser.yy" /* yacc.c:1646 */ { lconfig_dk->setMod( lconfig_keymod, 0 ); /*TODO:finzt das so mit dem lconfig_keymod?*/} +#line 5338 "configparser.cc" /* yacc.c:1646 */ break; case 297: -/* Line 1792 of yacc.c */ -#line 641 "configparser.yy" - { lconfig_nkeysym = AGUIX::getKeySymForString( (yyvsp[(13) - (14)].strptr) ); +#line 643 "configparser.yy" /* yacc.c:1646 */ + { lconfig_nkeysym = AGUIX::getKeySymForString( (yyvsp[-1].strptr) ); if ( lconfig_nkeysym != NoSymbol ) lconfig_dk->setKeySym( lconfig_nkeysym, 1 ); else lconfig_dk->setKeySym( 0, 1 ); /*TODO:Fehler printen?*/ lconfig_keymod = 0; } +#line 5348 "configparser.cc" /* yacc.c:1646 */ break; case 298: -/* Line 1792 of yacc.c */ -#line 646 "configparser.yy" +#line 648 "configparser.yy" /* yacc.c:1646 */ { lconfig_dk->setMod( lconfig_keymod, 1 ); } +#line 5354 "configparser.cc" /* yacc.c:1646 */ break; case 299: -/* Line 1792 of yacc.c */ -#line 647 "configparser.yy" +#line 649 "configparser.yy" /* yacc.c:1646 */ { lconfig_listsk->addElement( lconfig_dk ); } +#line 5360 "configparser.cc" /* yacc.c:1646 */ break; case 302: -/* Line 1792 of yacc.c */ -#line 651 "configparser.yy" +#line 653 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod |= ControlMask; } +#line 5366 "configparser.cc" /* yacc.c:1646 */ break; case 304: -/* Line 1792 of yacc.c */ -#line 652 "configparser.yy" +#line 654 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod |= ShiftMask; } +#line 5372 "configparser.cc" /* yacc.c:1646 */ break; case 306: -/* Line 1792 of yacc.c */ -#line 653 "configparser.yy" +#line 655 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod |= LockMask; } +#line 5378 "configparser.cc" /* yacc.c:1646 */ break; case 308: -/* Line 1792 of yacc.c */ -#line 654 "configparser.yy" +#line 656 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod |= Mod1Mask; } +#line 5384 "configparser.cc" /* yacc.c:1646 */ break; case 310: -/* Line 1792 of yacc.c */ -#line 655 "configparser.yy" +#line 657 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod |= Mod2Mask; } +#line 5390 "configparser.cc" /* yacc.c:1646 */ break; case 312: -/* Line 1792 of yacc.c */ -#line 656 "configparser.yy" +#line 658 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod |= Mod3Mask; } +#line 5396 "configparser.cc" /* yacc.c:1646 */ break; case 314: -/* Line 1792 of yacc.c */ -#line 657 "configparser.yy" +#line 659 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod |= Mod4Mask; } +#line 5402 "configparser.cc" /* yacc.c:1646 */ break; case 316: -/* Line 1792 of yacc.c */ -#line 658 "configparser.yy" +#line 660 "configparser.yy" /* yacc.c:1646 */ { lconfig_keymod |= Mod5Mask; } +#line 5408 "configparser.cc" /* yacc.c:1646 */ break; case 319: -/* Line 1792 of yacc.c */ -#line 661 "configparser.yy" +#line 663 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1 = new WCFiletype(); } +#line 5414 "configparser.cc" /* yacc.c:1646 */ break; case 320: -/* Line 1792 of yacc.c */ -#line 662 "configparser.yy" +#line 664 "configparser.yy" /* yacc.c:1646 */ { lconfig_listft->addElement( lconfig_ft1 ); lconfig_ft1 = NULL; } +#line 5422 "configparser.cc" /* yacc.c:1646 */ break; case 322: -/* Line 1792 of yacc.c */ -#line 665 "configparser.yy" +#line 667 "configparser.yy" /* yacc.c:1646 */ { lconfig_ignorelist = new List(); } +#line 5428 "configparser.cc" /* yacc.c:1646 */ break; case 323: -/* Line 1792 of yacc.c */ -#line 666 "configparser.yy" +#line 668 "configparser.yy" /* yacc.c:1646 */ { lconfig->setDontCheckDirs( lconfig_ignorelist ); lconfig_id = lconfig_ignorelist->initEnum(); lconfig_tstr = (char*)lconfig_ignorelist->getFirstElement( lconfig_id ); @@ -6072,31 +5440,31 @@ delete lconfig_ignorelist; lconfig_ignorelist = NULL; } +#line 5444 "configparser.cc" /* yacc.c:1646 */ break; case 325: -/* Line 1792 of yacc.c */ -#line 677 "configparser.yy" - { lconfig->setDontCheckVirtual( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 679 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setDontCheckVirtual( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5450 "configparser.cc" /* yacc.c:1646 */ break; case 328: -/* Line 1792 of yacc.c */ -#line 680 "configparser.yy" - { lconfig_ignorelist->addElement( dupstring( (yyvsp[(1) - (2)].strptr) ) ); } +#line 682 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ignorelist->addElement( dupstring( (yyvsp[-1].strptr) ) ); } +#line 5456 "configparser.cc" /* yacc.c:1646 */ break; case 331: -/* Line 1792 of yacc.c */ -#line 683 "configparser.yy" +#line 685 "configparser.yy" /* yacc.c:1646 */ { filetypehier.push_back( lconfig_ft1 ); lconfig_ft1 = new WCFiletype(); } +#line 5464 "configparser.cc" /* yacc.c:1646 */ break; case 332: -/* Line 1792 of yacc.c */ -#line 686 "configparser.yy" +#line 688 "configparser.yy" /* yacc.c:1646 */ { old_lconfig_ft1 = filetypehier.back(); filetypehier.pop_back(); if ( old_lconfig_ft1 != NULL ) { @@ -6106,217 +5474,217 @@ } lconfig_ft1 = old_lconfig_ft1; } +#line 5478 "configparser.cc" /* yacc.c:1646 */ break; case 335: -/* Line 1792 of yacc.c */ -#line 697 "configparser.yy" - { lconfig_ft1->setinternID( (yyvsp[(3) - (4)].num) ); } +#line 699 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setinternID( (yyvsp[-1].num) ); } +#line 5484 "configparser.cc" /* yacc.c:1646 */ break; case 337: -/* Line 1792 of yacc.c */ -#line 698 "configparser.yy" - { lconfig_ft1->setName( (yyvsp[(3) - (4)].strptr) ); } +#line 700 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setName( (yyvsp[-1].strptr) ); } +#line 5490 "configparser.cc" /* yacc.c:1646 */ break; case 339: -/* Line 1792 of yacc.c */ -#line 699 "configparser.yy" - { lconfig_ft1->setPattern( (yyvsp[(3) - (4)].strptr) ); } +#line 701 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setPattern( (yyvsp[-1].strptr) ); } +#line 5496 "configparser.cc" /* yacc.c:1646 */ break; case 341: -/* Line 1792 of yacc.c */ -#line 700 "configparser.yy" - { lconfig_ft1->setUsePattern( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 702 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setUsePattern( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5502 "configparser.cc" /* yacc.c:1646 */ break; case 343: -/* Line 1792 of yacc.c */ -#line 701 "configparser.yy" +#line 703 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->clearFiledesc(); } +#line 5508 "configparser.cc" /* yacc.c:1646 */ break; case 345: -/* Line 1792 of yacc.c */ -#line 703 "configparser.yy" - { lconfig_ft1->setUseFiledesc( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 705 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setUseFiledesc( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5514 "configparser.cc" /* yacc.c:1646 */ break; case 347: -/* Line 1792 of yacc.c */ -#line 704 "configparser.yy" - { lconfig_ft1->setPatternIgnoreCase( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 706 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setPatternIgnoreCase( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5520 "configparser.cc" /* yacc.c:1646 */ break; case 349: -/* Line 1792 of yacc.c */ -#line 705 "configparser.yy" - { lconfig_ft1->setPatternUseRegExp( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 707 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setPatternUseRegExp( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5526 "configparser.cc" /* yacc.c:1646 */ break; case 351: -/* Line 1792 of yacc.c */ -#line 706 "configparser.yy" - { lconfig_ft1->setPatternUseFullname( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 708 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setPatternUseFullname( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5532 "configparser.cc" /* yacc.c:1646 */ break; case 354: -/* Line 1792 of yacc.c */ -#line 708 "configparser.yy" - { lconfig_ft1->setExtCond( (yyvsp[(3) - (4)].strptr) ); } +#line 710 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setExtCond( (yyvsp[-1].strptr) ); } +#line 5538 "configparser.cc" /* yacc.c:1646 */ break; case 356: -/* Line 1792 of yacc.c */ -#line 709 "configparser.yy" - { lconfig_ft1->setUseExtCond( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 711 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setUseExtCond( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5544 "configparser.cc" /* yacc.c:1646 */ break; case 359: -/* Line 1792 of yacc.c */ -#line 711 "configparser.yy" - { lconfig_ft1->setCustomColor( 0, 0, (yyvsp[(3) - (6)].num) ); - lconfig_ft1->setCustomColor( 1, 0, (yyvsp[(5) - (6)].num) ); +#line 713 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setCustomColor( 0, 0, (yyvsp[-3].num) ); + lconfig_ft1->setCustomColor( 1, 0, (yyvsp[-1].num) ); } +#line 5552 "configparser.cc" /* yacc.c:1646 */ break; case 361: -/* Line 1792 of yacc.c */ -#line 714 "configparser.yy" - { lconfig_ft1->setCustomColor( 0, 1, (yyvsp[(3) - (6)].num) ); - lconfig_ft1->setCustomColor( 1, 1, (yyvsp[(5) - (6)].num) ); +#line 716 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setCustomColor( 0, 1, (yyvsp[-3].num) ); + lconfig_ft1->setCustomColor( 1, 1, (yyvsp[-1].num) ); } +#line 5560 "configparser.cc" /* yacc.c:1646 */ break; case 363: -/* Line 1792 of yacc.c */ -#line 717 "configparser.yy" - { lconfig_ft1->setCustomColor( 0, 2, (yyvsp[(3) - (6)].num) ); - lconfig_ft1->setCustomColor( 1, 2, (yyvsp[(5) - (6)].num) ); +#line 719 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setCustomColor( 0, 2, (yyvsp[-3].num) ); + lconfig_ft1->setCustomColor( 1, 2, (yyvsp[-1].num) ); } +#line 5568 "configparser.cc" /* yacc.c:1646 */ break; case 365: -/* Line 1792 of yacc.c */ -#line 720 "configparser.yy" - { lconfig_ft1->setCustomColor( 0, 3, (yyvsp[(3) - (6)].num) ); - lconfig_ft1->setCustomColor( 1, 3, (yyvsp[(5) - (6)].num) ); +#line 722 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setCustomColor( 0, 3, (yyvsp[-3].num) ); + lconfig_ft1->setCustomColor( 1, 3, (yyvsp[-1].num) ); } +#line 5576 "configparser.cc" /* yacc.c:1646 */ break; case 367: -/* Line 1792 of yacc.c */ -#line 723 "configparser.yy" - { lconfig_ft1->setColorExt( (yyvsp[(3) - (4)].strptr) ); } +#line 725 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setColorExt( (yyvsp[-1].strptr) ); } +#line 5582 "configparser.cc" /* yacc.c:1646 */ break; case 369: -/* Line 1792 of yacc.c */ -#line 724 "configparser.yy" +#line 726 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->setColorMode( WCFiletype::DEFAULTCOL ); } +#line 5588 "configparser.cc" /* yacc.c:1646 */ break; case 371: -/* Line 1792 of yacc.c */ -#line 725 "configparser.yy" +#line 727 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->setColorMode( WCFiletype::CUSTOMCOL ); } +#line 5594 "configparser.cc" /* yacc.c:1646 */ break; case 373: -/* Line 1792 of yacc.c */ -#line 726 "configparser.yy" +#line 728 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->setColorMode( WCFiletype::EXTERNALCOL ); } +#line 5600 "configparser.cc" /* yacc.c:1646 */ break; case 375: -/* Line 1792 of yacc.c */ -#line 727 "configparser.yy" +#line 729 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->setColorMode( WCFiletype::PARENTCOL ); } +#line 5606 "configparser.cc" /* yacc.c:1646 */ break; case 377: -/* Line 1792 of yacc.c */ -#line 728 "configparser.yy" - { lconfig_ft1->setMagicPattern( (yyvsp[(3) - (4)].strptr) ); } +#line 730 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setMagicPattern( (yyvsp[-1].strptr) ); } +#line 5612 "configparser.cc" /* yacc.c:1646 */ break; case 379: -/* Line 1792 of yacc.c */ -#line 729 "configparser.yy" - { lconfig_ft1->setUseMagic( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 731 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setUseMagic( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5618 "configparser.cc" /* yacc.c:1646 */ break; case 381: -/* Line 1792 of yacc.c */ -#line 730 "configparser.yy" - { lconfig_ft1->setMagicCompressed( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 732 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setMagicCompressed( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5624 "configparser.cc" /* yacc.c:1646 */ break; case 383: -/* Line 1792 of yacc.c */ -#line 731 "configparser.yy" - { lconfig_ft1->setMagicMime( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 733 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setMagicMime( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5630 "configparser.cc" /* yacc.c:1646 */ break; case 385: -/* Line 1792 of yacc.c */ -#line 732 "configparser.yy" - { lconfig_ft1->setMagicIgnoreCase( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 734 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setMagicIgnoreCase( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5636 "configparser.cc" /* yacc.c:1646 */ break; case 387: -/* Line 1792 of yacc.c */ -#line 733 "configparser.yy" - { lconfig_ft1->setPatternIsCommaSeparated( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 735 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setPatternIsCommaSeparated( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 5642 "configparser.cc" /* yacc.c:1646 */ break; case 390: -/* Line 1792 of yacc.c */ -#line 736 "configparser.yy" - { lconfig_ft1->setFiledesc( (yyvsp[(1) - (4)].num), (yyvsp[(3) - (4)].num) ); } +#line 738 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setFiledesc( (yyvsp[-3].num), (yyvsp[-1].num) ); } +#line 5648 "configparser.cc" /* yacc.c:1646 */ break; case 393: -/* Line 1792 of yacc.c */ -#line 739 "configparser.yy" +#line 741 "configparser.yy" /* yacc.c:1646 */ { (yyval.num) = NORMALTYPE; } +#line 5654 "configparser.cc" /* yacc.c:1646 */ break; case 394: -/* Line 1792 of yacc.c */ -#line 740 "configparser.yy" +#line 742 "configparser.yy" /* yacc.c:1646 */ { (yyval.num) = NOTYETTYPE; } +#line 5660 "configparser.cc" /* yacc.c:1646 */ break; case 395: -/* Line 1792 of yacc.c */ -#line 741 "configparser.yy" +#line 743 "configparser.yy" /* yacc.c:1646 */ { (yyval.num) = UNKNOWNTYPE; } +#line 5666 "configparser.cc" /* yacc.c:1646 */ break; case 396: -/* Line 1792 of yacc.c */ -#line 742 "configparser.yy" +#line 744 "configparser.yy" /* yacc.c:1646 */ { (yyval.num) = VOIDTYPE; } +#line 5672 "configparser.cc" /* yacc.c:1646 */ break; case 397: -/* Line 1792 of yacc.c */ -#line 743 "configparser.yy" +#line 745 "configparser.yy" /* yacc.c:1646 */ { (yyval.num) = DIRTYPE; } +#line 5678 "configparser.cc" /* yacc.c:1646 */ break; case 398: -/* Line 1792 of yacc.c */ -#line 746 "configparser.yy" +#line 748 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom = new List(); } +#line 5684 "configparser.cc" /* yacc.c:1646 */ break; case 399: -/* Line 1792 of yacc.c */ -#line 747 "configparser.yy" +#line 749 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->setDNDActions( lconfig_listcom ); lconfig_id = lconfig_listcom->initEnum(); lconfig_fp1 = (FunctionProto*)lconfig_listcom->getFirstElement( lconfig_id ); @@ -6330,17 +5698,17 @@ lconfig_listcom = NULL; //TODO: ggf. noch die Flags uebertragen } +#line 5702 "configparser.cc" /* yacc.c:1646 */ break; case 401: -/* Line 1792 of yacc.c */ -#line 760 "configparser.yy" +#line 762 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom = new List(); } +#line 5708 "configparser.cc" /* yacc.c:1646 */ break; case 402: -/* Line 1792 of yacc.c */ -#line 761 "configparser.yy" +#line 763 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->setDoubleClickActions( lconfig_listcom ); lconfig_id = lconfig_listcom->initEnum(); lconfig_fp1 = (FunctionProto*)lconfig_listcom->getFirstElement( lconfig_id ); @@ -6354,17 +5722,17 @@ lconfig_listcom = NULL; //TODO: ggf. noch die Flags uebertragen } +#line 5726 "configparser.cc" /* yacc.c:1646 */ break; case 404: -/* Line 1792 of yacc.c */ -#line 774 "configparser.yy" +#line 776 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom = new List(); } +#line 5732 "configparser.cc" /* yacc.c:1646 */ break; case 405: -/* Line 1792 of yacc.c */ -#line 775 "configparser.yy" +#line 777 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->setShowActions( lconfig_listcom ); lconfig_id = lconfig_listcom->initEnum(); lconfig_fp1 = (FunctionProto*)lconfig_listcom->getFirstElement( lconfig_id ); @@ -6378,17 +5746,17 @@ lconfig_listcom = NULL; //TODO: ggf. noch die Flags uebertragen } +#line 5750 "configparser.cc" /* yacc.c:1646 */ break; case 407: -/* Line 1792 of yacc.c */ -#line 788 "configparser.yy" +#line 790 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom = new List(); } +#line 5756 "configparser.cc" /* yacc.c:1646 */ break; case 408: -/* Line 1792 of yacc.c */ -#line 789 "configparser.yy" +#line 791 "configparser.yy" /* yacc.c:1646 */ { lconfig_ft1->setRawShowActions( lconfig_listcom ); lconfig_id = lconfig_listcom->initEnum(); lconfig_fp1 = (FunctionProto*)lconfig_listcom->getFirstElement( lconfig_id ); @@ -6402,18 +5770,18 @@ lconfig_listcom = NULL; //TODO: ggf. noch die Flags uebertragen } +#line 5774 "configparser.cc" /* yacc.c:1646 */ break; case 410: -/* Line 1792 of yacc.c */ -#line 802 "configparser.yy" +#line 804 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom = new List(); } +#line 5780 "configparser.cc" /* yacc.c:1646 */ break; case 411: -/* Line 1792 of yacc.c */ -#line 803 "configparser.yy" - { lconfig_ft1->setUserActions( (yyvsp[(2) - (6)].num), lconfig_listcom ); +#line 805 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setUserActions( (yyvsp[-4].num), lconfig_listcom ); lconfig_id = lconfig_listcom->initEnum(); lconfig_fp1 = (FunctionProto*)lconfig_listcom->getFirstElement( lconfig_id ); while ( lconfig_fp1 != NULL ) { @@ -6426,18 +5794,18 @@ lconfig_listcom = NULL; //TODO: ggf. noch die Flags uebertragen } +#line 5798 "configparser.cc" /* yacc.c:1646 */ break; case 413: -/* Line 1792 of yacc.c */ -#line 816 "configparser.yy" +#line 818 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom = new List(); } +#line 5804 "configparser.cc" /* yacc.c:1646 */ break; case 414: -/* Line 1792 of yacc.c */ -#line 819 "configparser.yy" - { lconfig_ft1->setCustomActions( (yyvsp[(6) - (12)].strptr), lconfig_listcom ); +#line 821 "configparser.yy" /* yacc.c:1646 */ + { lconfig_ft1->setCustomActions( (yyvsp[-6].strptr), lconfig_listcom ); lconfig_id = lconfig_listcom->initEnum(); lconfig_fp1 = (FunctionProto*)lconfig_listcom->getFirstElement( lconfig_id ); while ( lconfig_fp1 != NULL ) { @@ -6449,37 +5817,37 @@ delete lconfig_listcom; lconfig_listcom = NULL; } +#line 5821 "configparser.cc" /* yacc.c:1646 */ break; case 421: -/* Line 1792 of yacc.c */ -#line 839 "configparser.yy" +#line 841 "configparser.yy" /* yacc.c:1646 */ { lconfig_hk1 = new WCHotkey(); } +#line 5827 "configparser.cc" /* yacc.c:1646 */ break; case 422: -/* Line 1792 of yacc.c */ -#line 840 "configparser.yy" +#line 842 "configparser.yy" /* yacc.c:1646 */ { lconfig_listh->addElement( lconfig_hk1 ); lconfig_hk1 = NULL; } +#line 5835 "configparser.cc" /* yacc.c:1646 */ break; case 425: -/* Line 1792 of yacc.c */ -#line 845 "configparser.yy" - { lconfig_hk1->setName( (yyvsp[(3) - (4)].strptr) ); } +#line 847 "configparser.yy" /* yacc.c:1646 */ + { lconfig_hk1->setName( (yyvsp[-1].strptr) ); } +#line 5841 "configparser.cc" /* yacc.c:1646 */ break; case 427: -/* Line 1792 of yacc.c */ -#line 846 "configparser.yy" +#line 848 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom = new List(); } +#line 5847 "configparser.cc" /* yacc.c:1646 */ break; case 428: -/* Line 1792 of yacc.c */ -#line 847 "configparser.yy" +#line 849 "configparser.yy" /* yacc.c:1646 */ { lconfig_hk1->setComs( lconfig_listcom ); lconfig_id = lconfig_listcom->initEnum(); lconfig_fp1 = (FunctionProto*)lconfig_listcom->getFirstElement( lconfig_id ); @@ -6493,17 +5861,17 @@ lconfig_listcom = NULL; //TODO: ggf. noch die Flags uebertragen } +#line 5865 "configparser.cc" /* yacc.c:1646 */ break; case 430: -/* Line 1792 of yacc.c */ -#line 860 "configparser.yy" +#line 862 "configparser.yy" /* yacc.c:1646 */ { lconfig_listsk = new List(); } +#line 5871 "configparser.cc" /* yacc.c:1646 */ break; case 431: -/* Line 1792 of yacc.c */ -#line 861 "configparser.yy" +#line 863 "configparser.yy" /* yacc.c:1646 */ { lconfig_hk1->setDoubleKeys( lconfig_listsk ); lconfig_id = lconfig_listsk->initEnum(); lconfig_dk = (WCDoubleShortkey*)lconfig_listsk->getFirstElement( lconfig_id ); @@ -6516,57 +5884,57 @@ delete lconfig_listsk; lconfig_listsk = NULL; } +#line 5888 "configparser.cc" /* yacc.c:1646 */ break; case 434: -/* Line 1792 of yacc.c */ -#line 875 "configparser.yy" +#line 877 "configparser.yy" /* yacc.c:1646 */ { lconfig_bt1 = new WCButton(); } +#line 5894 "configparser.cc" /* yacc.c:1646 */ break; case 435: -/* Line 1792 of yacc.c */ -#line 876 "configparser.yy" +#line 878 "configparser.yy" /* yacc.c:1646 */ { lconfig_bt1->setCheck( true ); while ( lconfig_listb->size() < ( lconfig_pos + 1 ) ) lconfig_listb->addElement( new WCButton() ); lconfig_bt1 = (WCButton*)lconfig_listb->exchangeElement( lconfig_pos, lconfig_bt1 ); delete lconfig_bt1; lconfig_bt1 = NULL; } +#line 5905 "configparser.cc" /* yacc.c:1646 */ break; case 438: -/* Line 1792 of yacc.c */ -#line 884 "configparser.yy" - { lconfig_pos = (yyvsp[(3) - (4)].num); +#line 886 "configparser.yy" /* yacc.c:1646 */ + { lconfig_pos = (yyvsp[-1].num); if ( lconfig_pos < 0 ) lconfig_pos = 0; if ( lconfig_pos > 100000 ) lconfig_pos = 100000; } +#line 5914 "configparser.cc" /* yacc.c:1646 */ break; case 440: -/* Line 1792 of yacc.c */ -#line 888 "configparser.yy" - { lconfig_bt1->setText( (yyvsp[(3) - (4)].strptr) ); } +#line 890 "configparser.yy" /* yacc.c:1646 */ + { lconfig_bt1->setText( (yyvsp[-1].strptr) ); } +#line 5920 "configparser.cc" /* yacc.c:1646 */ break; case 442: -/* Line 1792 of yacc.c */ -#line 889 "configparser.yy" - { lconfig_bt1->setFG( (yyvsp[(3) - (6)].num) ); - lconfig_bt1->setBG( (yyvsp[(5) - (6)].num) ); +#line 891 "configparser.yy" /* yacc.c:1646 */ + { lconfig_bt1->setFG( (yyvsp[-3].num) ); + lconfig_bt1->setBG( (yyvsp[-1].num) ); } +#line 5928 "configparser.cc" /* yacc.c:1646 */ break; case 444: -/* Line 1792 of yacc.c */ -#line 892 "configparser.yy" +#line 894 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom = new List(); } +#line 5934 "configparser.cc" /* yacc.c:1646 */ break; case 445: -/* Line 1792 of yacc.c */ -#line 893 "configparser.yy" +#line 895 "configparser.yy" /* yacc.c:1646 */ { lconfig_bt1->setComs( lconfig_listcom ); lconfig_id = lconfig_listcom->initEnum(); lconfig_fp1 = (FunctionProto*)lconfig_listcom->getFirstElement( lconfig_id ); @@ -6580,17 +5948,17 @@ lconfig_listcom = NULL; //TODO: ggf. noch die Flags uebertragen } +#line 5952 "configparser.cc" /* yacc.c:1646 */ break; case 447: -/* Line 1792 of yacc.c */ -#line 906 "configparser.yy" +#line 908 "configparser.yy" /* yacc.c:1646 */ { lconfig_listsk = new List(); } +#line 5958 "configparser.cc" /* yacc.c:1646 */ break; case 448: -/* Line 1792 of yacc.c */ -#line 907 "configparser.yy" +#line 909 "configparser.yy" /* yacc.c:1646 */ { lconfig_bt1->setDoubleKeys( lconfig_listsk ); lconfig_id = lconfig_listsk->initEnum(); lconfig_dk = (WCDoubleShortkey*)lconfig_listsk->getFirstElement( lconfig_id ); @@ -6603,2353 +5971,2389 @@ delete lconfig_listsk; lconfig_listsk = NULL; } +#line 5975 "configparser.cc" /* yacc.c:1646 */ break; case 451: -/* Line 1792 of yacc.c */ -#line 922 "configparser.yy" +#line 924 "configparser.yy" /* yacc.c:1646 */ { #ifndef HAVE_XFT - lconfig->setFont( 0, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 0, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_X11_GLOBAL, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_X11_GLOBAL, (yyvsp[-1].strptr) ); } +#line 5986 "configparser.cc" /* yacc.c:1646 */ break; case 453: -/* Line 1792 of yacc.c */ -#line 929 "configparser.yy" +#line 931 "configparser.yy" /* yacc.c:1646 */ { #ifndef HAVE_XFT - lconfig->setFont( 1, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 1, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_X11_BUTTONS, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_X11_BUTTONS, (yyvsp[-1].strptr) ); } +#line 5997 "configparser.cc" /* yacc.c:1646 */ break; case 455: -/* Line 1792 of yacc.c */ -#line 936 "configparser.yy" +#line 938 "configparser.yy" /* yacc.c:1646 */ { #ifndef HAVE_XFT - lconfig->setFont( 2, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 2, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_X11_LEFT, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_X11_LEFT, (yyvsp[-1].strptr) ); } +#line 6008 "configparser.cc" /* yacc.c:1646 */ break; case 457: -/* Line 1792 of yacc.c */ -#line 943 "configparser.yy" +#line 945 "configparser.yy" /* yacc.c:1646 */ { #ifndef HAVE_XFT - lconfig->setFont( 3, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 3, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_X11_RIGHT, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_X11_RIGHT, (yyvsp[-1].strptr) ); } +#line 6019 "configparser.cc" /* yacc.c:1646 */ break; case 459: -/* Line 1792 of yacc.c */ -#line 950 "configparser.yy" +#line 952 "configparser.yy" /* yacc.c:1646 */ { #ifndef HAVE_XFT - lconfig->setFont( 4, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 4, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_X11_TEXTVIEW, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_X11_TEXTVIEW, (yyvsp[-1].strptr) ); } +#line 6030 "configparser.cc" /* yacc.c:1646 */ break; case 461: -/* Line 1792 of yacc.c */ -#line 957 "configparser.yy" +#line 959 "configparser.yy" /* yacc.c:1646 */ { #ifndef HAVE_XFT - lconfig->setFont( 5, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 5, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_X11_STATEBAR, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_X11_STATEBAR, (yyvsp[-1].strptr) ); } +#line 6041 "configparser.cc" /* yacc.c:1646 */ break; case 464: -/* Line 1792 of yacc.c */ -#line 966 "configparser.yy" +#line 968 "configparser.yy" /* yacc.c:1646 */ { #ifdef HAVE_XFT - lconfig->setFont( 0, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 0, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_XFT_GLOBAL, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_XFT_GLOBAL, (yyvsp[-1].strptr) ); } +#line 6052 "configparser.cc" /* yacc.c:1646 */ break; case 466: -/* Line 1792 of yacc.c */ -#line 973 "configparser.yy" +#line 975 "configparser.yy" /* yacc.c:1646 */ { #ifdef HAVE_XFT - lconfig->setFont( 1, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 1, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_XFT_BUTTONS, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_XFT_BUTTONS, (yyvsp[-1].strptr) ); } +#line 6063 "configparser.cc" /* yacc.c:1646 */ break; case 468: -/* Line 1792 of yacc.c */ -#line 980 "configparser.yy" +#line 982 "configparser.yy" /* yacc.c:1646 */ { #ifdef HAVE_XFT - lconfig->setFont( 2, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 2, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_XFT_LEFT, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_XFT_LEFT, (yyvsp[-1].strptr) ); } +#line 6074 "configparser.cc" /* yacc.c:1646 */ break; case 470: -/* Line 1792 of yacc.c */ -#line 987 "configparser.yy" +#line 989 "configparser.yy" /* yacc.c:1646 */ { #ifdef HAVE_XFT - lconfig->setFont( 3, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 3, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_XFT_RIGHT, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_XFT_RIGHT, (yyvsp[-1].strptr) ); } +#line 6085 "configparser.cc" /* yacc.c:1646 */ break; case 472: -/* Line 1792 of yacc.c */ -#line 994 "configparser.yy" +#line 996 "configparser.yy" /* yacc.c:1646 */ { #ifdef HAVE_XFT - lconfig->setFont( 4, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 4, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_XFT_TEXTVIEW, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_XFT_TEXTVIEW, (yyvsp[-1].strptr) ); } +#line 6096 "configparser.cc" /* yacc.c:1646 */ break; case 474: -/* Line 1792 of yacc.c */ -#line 1001 "configparser.yy" +#line 1003 "configparser.yy" /* yacc.c:1646 */ { #ifdef HAVE_XFT - lconfig->setFont( 5, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFont( 5, (yyvsp[-1].strptr) ); #endif - lconfig->setFontName( WConfig::FONT_XFT_STATEBAR, (yyvsp[(3) - (4)].strptr) ); + lconfig->setFontName( WConfig::FONT_XFT_STATEBAR, (yyvsp[-1].strptr) ); } +#line 6107 "configparser.cc" /* yacc.c:1646 */ break; case 477: -/* Line 1792 of yacc.c */ -#line 1010 "configparser.yy" +#line 1012 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMMountCommand( (yyvsp[(3) - (4)].strptr) ); + lconfig->setVMMountCommand( (yyvsp[-1].strptr) ); } +#line 6115 "configparser.cc" /* yacc.c:1646 */ break; case 479: -/* Line 1792 of yacc.c */ -#line 1014 "configparser.yy" +#line 1016 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMUnmountCommand( (yyvsp[(3) - (4)].strptr) ); + lconfig->setVMUnmountCommand( (yyvsp[-1].strptr) ); } +#line 6123 "configparser.cc" /* yacc.c:1646 */ break; case 481: -/* Line 1792 of yacc.c */ -#line 1018 "configparser.yy" +#line 1020 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMEjectCommand( (yyvsp[(3) - (4)].strptr) ); + lconfig->setVMEjectCommand( (yyvsp[-1].strptr) ); } +#line 6131 "configparser.cc" /* yacc.c:1646 */ break; case 483: -/* Line 1792 of yacc.c */ -#line 1022 "configparser.yy" +#line 1024 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMCloseTrayCommand( (yyvsp[(3) - (4)].strptr) ); + lconfig->setVMCloseTrayCommand( (yyvsp[-1].strptr) ); } +#line 6139 "configparser.cc" /* yacc.c:1646 */ break; case 485: -/* Line 1792 of yacc.c */ -#line 1026 "configparser.yy" +#line 1028 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMFStabFile( (yyvsp[(3) - (4)].strptr) ); + lconfig->setVMFStabFile( (yyvsp[-1].strptr) ); } +#line 6147 "configparser.cc" /* yacc.c:1646 */ break; case 487: -/* Line 1792 of yacc.c */ -#line 1030 "configparser.yy" +#line 1032 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMMtabFile( (yyvsp[(3) - (4)].strptr) ); + lconfig->setVMMtabFile( (yyvsp[-1].strptr) ); } +#line 6155 "configparser.cc" /* yacc.c:1646 */ break; case 489: -/* Line 1792 of yacc.c */ -#line 1034 "configparser.yy" +#line 1036 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMPartitionFile( (yyvsp[(3) - (4)].strptr) ); + lconfig->setVMPartitionFile( (yyvsp[-1].strptr) ); } +#line 6163 "configparser.cc" /* yacc.c:1646 */ break; case 491: -/* Line 1792 of yacc.c */ -#line 1038 "configparser.yy" +#line 1040 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMRequestAction( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); + lconfig->setVMRequestAction( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6171 "configparser.cc" /* yacc.c:1646 */ break; case 493: -/* Line 1792 of yacc.c */ -#line 1042 "configparser.yy" +#line 1044 "configparser.yy" /* yacc.c:1646 */ { - lconfig->setVMPreferredUdisksVersion( (yyvsp[(3) - (4)].num) ); + lconfig->setVMPreferredUdisksVersion( (yyvsp[-1].num) ); } +#line 6179 "configparser.cc" /* yacc.c:1646 */ break; case 496: -/* Line 1792 of yacc.c */ -#line 1047 "configparser.yy" +#line 1049 "configparser.yy" /* yacc.c:1646 */ { lconfig->setClockbarMode( WConfig::CLOCKBAR_MODE_TIMERAM ); } +#line 6185 "configparser.cc" /* yacc.c:1646 */ break; case 498: -/* Line 1792 of yacc.c */ -#line 1048 "configparser.yy" +#line 1050 "configparser.yy" /* yacc.c:1646 */ { lconfig->setClockbarMode( WConfig::CLOCKBAR_MODE_TIME ); } +#line 6191 "configparser.cc" /* yacc.c:1646 */ break; case 500: -/* Line 1792 of yacc.c */ -#line 1049 "configparser.yy" +#line 1051 "configparser.yy" /* yacc.c:1646 */ { lconfig->setClockbarMode( WConfig::CLOCKBAR_MODE_VERSION ); } +#line 6197 "configparser.cc" /* yacc.c:1646 */ break; case 502: -/* Line 1792 of yacc.c */ -#line 1050 "configparser.yy" +#line 1052 "configparser.yy" /* yacc.c:1646 */ { lconfig->setClockbarMode( WConfig::CLOCKBAR_MODE_EXTERN ); } +#line 6203 "configparser.cc" /* yacc.c:1646 */ break; case 504: -/* Line 1792 of yacc.c */ -#line 1051 "configparser.yy" - { lconfig->setClockbarUpdatetime( (yyvsp[(3) - (4)].num) ); } +#line 1053 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setClockbarUpdatetime( (yyvsp[-1].num) ); } +#line 6209 "configparser.cc" /* yacc.c:1646 */ break; case 506: -/* Line 1792 of yacc.c */ -#line 1052 "configparser.yy" - { lconfig->setClockbarCommand( (yyvsp[(3) - (4)].strptr) ); } +#line 1054 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setClockbarCommand( (yyvsp[-1].strptr) ); } +#line 6215 "configparser.cc" /* yacc.c:1646 */ break; case 508: -/* Line 1792 of yacc.c */ -#line 1053 "configparser.yy" - { lconfig->setClockbarHints( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } +#line 1055 "configparser.yy" /* yacc.c:1646 */ + { lconfig->setClockbarHints( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6221 "configparser.cc" /* yacc.c:1646 */ break; case 511: -/* Line 1792 of yacc.c */ -#line 1056 "configparser.yy" +#line 1058 "configparser.yy" /* yacc.c:1646 */ { (yyval.num) = 1; } +#line 6227 "configparser.cc" /* yacc.c:1646 */ break; case 512: -/* Line 1792 of yacc.c */ -#line 1057 "configparser.yy" +#line 1059 "configparser.yy" /* yacc.c:1646 */ { (yyval.num) = 0; } +#line 6233 "configparser.cc" /* yacc.c:1646 */ break; - case 582: -/* Line 1792 of yacc.c */ -#line 1129 "configparser.yy" + case 583: +#line 1132 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new OwnOp(); } +#line 6239 "configparser.cc" /* yacc.c:1646 */ break; - case 583: -/* Line 1792 of yacc.c */ -#line 1130 "configparser.yy" + case 584: +#line 1133 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6245 "configparser.cc" /* yacc.c:1646 */ break; - case 584: -/* Line 1792 of yacc.c */ -#line 1132 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setComStr( (yyvsp[(3) - (4)].strptr) ); } + case 585: +#line 1135 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setComStr( (yyvsp[-1].strptr) ); } +#line 6251 "configparser.cc" /* yacc.c:1646 */ break; - case 586: -/* Line 1792 of yacc.c */ -#line 1133 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setSeparateEachEntry( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 587: +#line 1136 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setSeparateEachEntry( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6257 "configparser.cc" /* yacc.c:1646 */ break; - case 588: -/* Line 1792 of yacc.c */ -#line 1134 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setRecursive( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 589: +#line 1137 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setRecursive( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6263 "configparser.cc" /* yacc.c:1646 */ break; - case 590: -/* Line 1792 of yacc.c */ -#line 1135 "configparser.yy" + case 591: +#line 1138 "configparser.yy" /* yacc.c:1646 */ { ((OwnOp*)lconfig_fp1)->setOwnStart( OwnOp::OWNOP_START_IN_TERMINAL ); } +#line 6269 "configparser.cc" /* yacc.c:1646 */ break; - case 592: -/* Line 1792 of yacc.c */ -#line 1136 "configparser.yy" + case 593: +#line 1139 "configparser.yy" /* yacc.c:1646 */ { ((OwnOp*)lconfig_fp1)->setOwnStart( OwnOp::OWNOP_START_IN_TERMINAL_AND_WAIT4KEY ); } +#line 6275 "configparser.cc" /* yacc.c:1646 */ break; - case 594: -/* Line 1792 of yacc.c */ -#line 1137 "configparser.yy" + case 595: +#line 1140 "configparser.yy" /* yacc.c:1646 */ { ((OwnOp*)lconfig_fp1)->setOwnStart( OwnOp::OWNOP_SHOW_OUTPUT ); } +#line 6281 "configparser.cc" /* yacc.c:1646 */ break; - case 596: -/* Line 1792 of yacc.c */ -#line 1138 "configparser.yy" + case 597: +#line 1141 "configparser.yy" /* yacc.c:1646 */ { ((OwnOp*)lconfig_fp1)->setOwnStart( OwnOp::OWNOP_SHOW_OUTPUT_INT ); } +#line 6287 "configparser.cc" /* yacc.c:1646 */ break; - case 598: -/* Line 1792 of yacc.c */ -#line 1139 "configparser.yy" + case 599: +#line 1142 "configparser.yy" /* yacc.c:1646 */ { ((OwnOp*)lconfig_fp1)->setOwnStart( OwnOp::OWNOP_START_NORMAL ); } +#line 6293 "configparser.cc" /* yacc.c:1646 */ break; - case 600: -/* Line 1792 of yacc.c */ -#line 1140 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setViewStr( (yyvsp[(3) - (4)].strptr) ); } + case 601: +#line 1143 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setViewStr( (yyvsp[-1].strptr) ); } +#line 6299 "configparser.cc" /* yacc.c:1646 */ break; - case 602: -/* Line 1792 of yacc.c */ -#line 1141 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setInBackground( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 603: +#line 1144 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setInBackground( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6305 "configparser.cc" /* yacc.c:1646 */ break; - case 604: -/* Line 1792 of yacc.c */ -#line 1142 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setTakeDirs( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 605: +#line 1145 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setTakeDirs( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6311 "configparser.cc" /* yacc.c:1646 */ break; - case 606: -/* Line 1792 of yacc.c */ -#line 1143 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setDontCD( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 607: +#line 1146 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setDontCD( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6317 "configparser.cc" /* yacc.c:1646 */ break; - case 608: -/* Line 1792 of yacc.c */ -#line 1144 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setUseVirtualTempCopies( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 609: +#line 1147 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setUseVirtualTempCopies( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6323 "configparser.cc" /* yacc.c:1646 */ break; - case 610: -/* Line 1792 of yacc.c */ -#line 1145 "configparser.yy" - { ((OwnOp*)lconfig_fp1)->setFlagsAreRelativeToBaseDir( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 611: +#line 1148 "configparser.yy" /* yacc.c:1646 */ + { ((OwnOp*)lconfig_fp1)->setFlagsAreRelativeToBaseDir( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6329 "configparser.cc" /* yacc.c:1646 */ break; - case 613: -/* Line 1792 of yacc.c */ -#line 1148 "configparser.yy" + case 614: +#line 1151 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new DNDAction(); } +#line 6335 "configparser.cc" /* yacc.c:1646 */ break; - case 614: -/* Line 1792 of yacc.c */ -#line 1149 "configparser.yy" + case 615: +#line 1152 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6341 "configparser.cc" /* yacc.c:1646 */ break; - case 615: -/* Line 1792 of yacc.c */ -#line 1151 "configparser.yy" + case 616: +#line 1154 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new DoubleClickAction(); } +#line 6347 "configparser.cc" /* yacc.c:1646 */ break; - case 616: -/* Line 1792 of yacc.c */ -#line 1152 "configparser.yy" + case 617: +#line 1155 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6353 "configparser.cc" /* yacc.c:1646 */ break; - case 617: -/* Line 1792 of yacc.c */ -#line 1154 "configparser.yy" + case 618: +#line 1157 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ShowAction(); } +#line 6359 "configparser.cc" /* yacc.c:1646 */ break; - case 618: -/* Line 1792 of yacc.c */ -#line 1155 "configparser.yy" + case 619: +#line 1158 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6365 "configparser.cc" /* yacc.c:1646 */ break; - case 619: -/* Line 1792 of yacc.c */ -#line 1157 "configparser.yy" + case 620: +#line 1160 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new RawShowAction(); } +#line 6371 "configparser.cc" /* yacc.c:1646 */ break; - case 620: -/* Line 1792 of yacc.c */ -#line 1158 "configparser.yy" + case 621: +#line 1161 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6377 "configparser.cc" /* yacc.c:1646 */ break; - case 621: -/* Line 1792 of yacc.c */ -#line 1160 "configparser.yy" + case 622: +#line 1163 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new UserAction(); } +#line 6383 "configparser.cc" /* yacc.c:1646 */ break; - case 622: -/* Line 1792 of yacc.c */ -#line 1161 "configparser.yy" + case 623: +#line 1164 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6389 "configparser.cc" /* yacc.c:1646 */ break; - case 623: -/* Line 1792 of yacc.c */ -#line 1163 "configparser.yy" - { ((UserAction*)lconfig_fp1)->setNr( (yyvsp[(3) - (4)].num) ); } + case 624: +#line 1166 "configparser.yy" /* yacc.c:1646 */ + { ((UserAction*)lconfig_fp1)->setNr( (yyvsp[-1].num) ); } +#line 6395 "configparser.cc" /* yacc.c:1646 */ break; - case 626: -/* Line 1792 of yacc.c */ -#line 1166 "configparser.yy" + case 627: +#line 1169 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new RowUp(); } +#line 6401 "configparser.cc" /* yacc.c:1646 */ break; - case 627: -/* Line 1792 of yacc.c */ -#line 1167 "configparser.yy" + case 628: +#line 1170 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6407 "configparser.cc" /* yacc.c:1646 */ break; - case 628: -/* Line 1792 of yacc.c */ -#line 1169 "configparser.yy" + case 629: +#line 1172 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new RowDown(); } +#line 6413 "configparser.cc" /* yacc.c:1646 */ break; - case 629: -/* Line 1792 of yacc.c */ -#line 1170 "configparser.yy" + case 630: +#line 1173 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6419 "configparser.cc" /* yacc.c:1646 */ break; - case 630: -/* Line 1792 of yacc.c */ -#line 1172 "configparser.yy" + case 631: +#line 1175 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChangeHiddenFlag(); } +#line 6425 "configparser.cc" /* yacc.c:1646 */ break; - case 631: -/* Line 1792 of yacc.c */ -#line 1173 "configparser.yy" + case 632: +#line 1176 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6431 "configparser.cc" /* yacc.c:1646 */ break; - case 632: -/* Line 1792 of yacc.c */ -#line 1175 "configparser.yy" + case 633: +#line 1178 "configparser.yy" /* yacc.c:1646 */ { ((ChangeHiddenFlag*)lconfig_fp1)->setMode( 2 ); } +#line 6437 "configparser.cc" /* yacc.c:1646 */ break; - case 634: -/* Line 1792 of yacc.c */ -#line 1176 "configparser.yy" + case 635: +#line 1179 "configparser.yy" /* yacc.c:1646 */ { ((ChangeHiddenFlag*)lconfig_fp1)->setMode( 1 ); } +#line 6443 "configparser.cc" /* yacc.c:1646 */ break; - case 636: -/* Line 1792 of yacc.c */ -#line 1177 "configparser.yy" + case 637: +#line 1180 "configparser.yy" /* yacc.c:1646 */ { ((ChangeHiddenFlag*)lconfig_fp1)->setMode( 0 ); } +#line 6449 "configparser.cc" /* yacc.c:1646 */ break; - case 639: -/* Line 1792 of yacc.c */ -#line 1180 "configparser.yy" + case 640: +#line 1183 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new CopyOp(); } +#line 6455 "configparser.cc" /* yacc.c:1646 */ break; - case 640: -/* Line 1792 of yacc.c */ -#line 1181 "configparser.yy" + case 641: +#line 1184 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6461 "configparser.cc" /* yacc.c:1646 */ break; - case 641: -/* Line 1792 of yacc.c */ -#line 1183 "configparser.yy" - { ((CopyOp*)lconfig_fp1)->setFollowSymlinks( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 642: +#line 1186 "configparser.yy" /* yacc.c:1646 */ + { ((CopyOp*)lconfig_fp1)->setFollowSymlinks( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6467 "configparser.cc" /* yacc.c:1646 */ break; - case 643: -/* Line 1792 of yacc.c */ -#line 1184 "configparser.yy" - { ((CopyOp*)lconfig_fp1)->setMove( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 644: +#line 1187 "configparser.yy" /* yacc.c:1646 */ + { ((CopyOp*)lconfig_fp1)->setMove( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6473 "configparser.cc" /* yacc.c:1646 */ break; - case 645: -/* Line 1792 of yacc.c */ -#line 1185 "configparser.yy" - { ((CopyOp*)lconfig_fp1)->setRename( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 646: +#line 1188 "configparser.yy" /* yacc.c:1646 */ + { ((CopyOp*)lconfig_fp1)->setRename( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6479 "configparser.cc" /* yacc.c:1646 */ break; - case 647: -/* Line 1792 of yacc.c */ -#line 1186 "configparser.yy" - { ((CopyOp*)lconfig_fp1)->setSameDir( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 648: +#line 1189 "configparser.yy" /* yacc.c:1646 */ + { ((CopyOp*)lconfig_fp1)->setSameDir( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6485 "configparser.cc" /* yacc.c:1646 */ break; - case 649: -/* Line 1792 of yacc.c */ -#line 1187 "configparser.yy" - { ((CopyOp*)lconfig_fp1)->setRequestDest( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 650: +#line 1190 "configparser.yy" /* yacc.c:1646 */ + { ((CopyOp*)lconfig_fp1)->setRequestDest( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6491 "configparser.cc" /* yacc.c:1646 */ break; - case 651: -/* Line 1792 of yacc.c */ -#line 1188 "configparser.yy" - { ((CopyOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 652: +#line 1191 "configparser.yy" /* yacc.c:1646 */ + { ((CopyOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6497 "configparser.cc" /* yacc.c:1646 */ break; - case 653: -/* Line 1792 of yacc.c */ -#line 1189 "configparser.yy" + case 654: +#line 1192 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setOverwrite( CopyOp::COPYOP_OVERWRITE_ALWAYS ); } +#line 6503 "configparser.cc" /* yacc.c:1646 */ break; - case 655: -/* Line 1792 of yacc.c */ -#line 1190 "configparser.yy" + case 656: +#line 1193 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setOverwrite( CopyOp::COPYOP_OVERWRITE_NEVER ); } +#line 6509 "configparser.cc" /* yacc.c:1646 */ break; - case 657: -/* Line 1792 of yacc.c */ -#line 1191 "configparser.yy" + case 658: +#line 1194 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setOverwrite( CopyOp::COPYOP_OVERWRITE_NORMAL ); } +#line 6515 "configparser.cc" /* yacc.c:1646 */ break; - case 659: -/* Line 1792 of yacc.c */ -#line 1192 "configparser.yy" + case 660: +#line 1195 "configparser.yy" /* yacc.c:1646 */ {} +#line 6521 "configparser.cc" /* yacc.c:1646 */ break; - case 661: -/* Line 1792 of yacc.c */ -#line 1193 "configparser.yy" + case 662: +#line 1196 "configparser.yy" /* yacc.c:1646 */ {} +#line 6527 "configparser.cc" /* yacc.c:1646 */ break; - case 663: -/* Line 1792 of yacc.c */ -#line 1194 "configparser.yy" - { ((CopyOp*)lconfig_fp1)->setPreserveAttr( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 664: +#line 1197 "configparser.yy" /* yacc.c:1646 */ + { ((CopyOp*)lconfig_fp1)->setPreserveAttr( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6533 "configparser.cc" /* yacc.c:1646 */ break; - case 665: -/* Line 1792 of yacc.c */ -#line 1195 "configparser.yy" + case 666: +#line 1198 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setAdjustRelativeSymlinks( CopyOp::COPYOP_ADJUST_SYMLINK_NEVER ); } +#line 6539 "configparser.cc" /* yacc.c:1646 */ break; - case 667: -/* Line 1792 of yacc.c */ -#line 1196 "configparser.yy" + case 668: +#line 1199 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setAdjustRelativeSymlinks( CopyOp::COPYOP_ADJUST_SYMLINK_OUTSIDE ); } +#line 6545 "configparser.cc" /* yacc.c:1646 */ break; - case 669: -/* Line 1792 of yacc.c */ -#line 1197 "configparser.yy" + case 670: +#line 1200 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setAdjustRelativeSymlinks( CopyOp::COPYOP_ADJUST_SYMLINK_ALWAYS ); } +#line 6551 "configparser.cc" /* yacc.c:1646 */ break; - case 671: -/* Line 1792 of yacc.c */ -#line 1198 "configparser.yy" + case 672: +#line 1201 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setEnsureFilePermissions( LEAVE_PERMISSIONS_UNMODIFIED ); } +#line 6557 "configparser.cc" /* yacc.c:1646 */ break; - case 673: -/* Line 1792 of yacc.c */ -#line 1199 "configparser.yy" + case 674: +#line 1202 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setEnsureFilePermissions( ENSURE_USER_RW_PERMISSION ); } +#line 6563 "configparser.cc" /* yacc.c:1646 */ break; - case 675: -/* Line 1792 of yacc.c */ -#line 1200 "configparser.yy" + case 676: +#line 1203 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setEnsureFilePermissions( ENSURE_USER_RW_GROUP_R_PERMISSION ); } +#line 6569 "configparser.cc" /* yacc.c:1646 */ break; - case 677: -/* Line 1792 of yacc.c */ -#line 1201 "configparser.yy" + case 678: +#line 1204 "configparser.yy" /* yacc.c:1646 */ { ((CopyOp*)lconfig_fp1)->setEnsureFilePermissions( ENSURE_USER_RW_ALL_R_PERMISSION ); } +#line 6575 "configparser.cc" /* yacc.c:1646 */ break; case 680: -/* Line 1792 of yacc.c */ -#line 1204 "configparser.yy" +#line 1205 "configparser.yy" /* yacc.c:1646 */ + { ((CopyOp*)lconfig_fp1)->setVdirPreserveDirStructure( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6581 "configparser.cc" /* yacc.c:1646 */ + break; + + case 683: +#line 1208 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new FirstRow(); } +#line 6587 "configparser.cc" /* yacc.c:1646 */ break; - case 681: -/* Line 1792 of yacc.c */ -#line 1205 "configparser.yy" + case 684: +#line 1209 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6593 "configparser.cc" /* yacc.c:1646 */ break; - case 682: -/* Line 1792 of yacc.c */ -#line 1207 "configparser.yy" + case 685: +#line 1211 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new LastRow(); } +#line 6599 "configparser.cc" /* yacc.c:1646 */ break; - case 683: -/* Line 1792 of yacc.c */ -#line 1208 "configparser.yy" + case 686: +#line 1212 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6605 "configparser.cc" /* yacc.c:1646 */ break; - case 684: -/* Line 1792 of yacc.c */ -#line 1210 "configparser.yy" + case 687: +#line 1214 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new PageUp(); } +#line 6611 "configparser.cc" /* yacc.c:1646 */ break; - case 685: -/* Line 1792 of yacc.c */ -#line 1211 "configparser.yy" + case 688: +#line 1215 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6617 "configparser.cc" /* yacc.c:1646 */ break; - case 686: -/* Line 1792 of yacc.c */ -#line 1213 "configparser.yy" + case 689: +#line 1217 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new PageDown(); } +#line 6623 "configparser.cc" /* yacc.c:1646 */ break; - case 687: -/* Line 1792 of yacc.c */ -#line 1214 "configparser.yy" + case 690: +#line 1218 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6629 "configparser.cc" /* yacc.c:1646 */ break; - case 688: -/* Line 1792 of yacc.c */ -#line 1216 "configparser.yy" + case 691: +#line 1220 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SelectOp(); } +#line 6635 "configparser.cc" /* yacc.c:1646 */ break; - case 689: -/* Line 1792 of yacc.c */ -#line 1217 "configparser.yy" + case 692: +#line 1221 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6641 "configparser.cc" /* yacc.c:1646 */ break; - case 690: -/* Line 1792 of yacc.c */ -#line 1219 "configparser.yy" + case 693: +#line 1223 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SelectAllOp(); } +#line 6647 "configparser.cc" /* yacc.c:1646 */ break; - case 691: -/* Line 1792 of yacc.c */ -#line 1220 "configparser.yy" + case 694: +#line 1224 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6653 "configparser.cc" /* yacc.c:1646 */ break; - case 692: -/* Line 1792 of yacc.c */ -#line 1222 "configparser.yy" + case 695: +#line 1226 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SelectNoneOp(); } +#line 6659 "configparser.cc" /* yacc.c:1646 */ break; - case 693: -/* Line 1792 of yacc.c */ -#line 1223 "configparser.yy" + case 696: +#line 1227 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6665 "configparser.cc" /* yacc.c:1646 */ break; - case 694: -/* Line 1792 of yacc.c */ -#line 1225 "configparser.yy" + case 697: +#line 1229 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new InvertAllOp(); } +#line 6671 "configparser.cc" /* yacc.c:1646 */ break; - case 695: -/* Line 1792 of yacc.c */ -#line 1226 "configparser.yy" + case 698: +#line 1230 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6677 "configparser.cc" /* yacc.c:1646 */ break; - case 696: -/* Line 1792 of yacc.c */ -#line 1228 "configparser.yy" + case 699: +#line 1232 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ParentDirOp(); } +#line 6683 "configparser.cc" /* yacc.c:1646 */ break; - case 697: -/* Line 1792 of yacc.c */ -#line 1229 "configparser.yy" + case 700: +#line 1233 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6689 "configparser.cc" /* yacc.c:1646 */ break; - case 698: -/* Line 1792 of yacc.c */ -#line 1231 "configparser.yy" + case 701: +#line 1235 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new EnterDirOp(); } +#line 6695 "configparser.cc" /* yacc.c:1646 */ break; - case 699: -/* Line 1792 of yacc.c */ -#line 1232 "configparser.yy" + case 702: +#line 1236 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6701 "configparser.cc" /* yacc.c:1646 */ break; - case 700: -/* Line 1792 of yacc.c */ -#line 1234 "configparser.yy" - { ((EnterDirOp*)lconfig_fp1)->setDir( (yyvsp[(3) - (4)].strptr) ); } + case 703: +#line 1238 "configparser.yy" /* yacc.c:1646 */ + { ((EnterDirOp*)lconfig_fp1)->setDir( (yyvsp[-1].strptr) ); } +#line 6707 "configparser.cc" /* yacc.c:1646 */ break; - case 702: -/* Line 1792 of yacc.c */ -#line 1235 "configparser.yy" + case 705: +#line 1239 "configparser.yy" /* yacc.c:1646 */ { ((EnterDirOp*)lconfig_fp1)->setMode( EnterDirOp::ENTERDIROP_ACTIVE ); } +#line 6713 "configparser.cc" /* yacc.c:1646 */ break; - case 704: -/* Line 1792 of yacc.c */ -#line 1236 "configparser.yy" + case 707: +#line 1240 "configparser.yy" /* yacc.c:1646 */ { ((EnterDirOp*)lconfig_fp1)->setMode( EnterDirOp::ENTERDIROP_ACTIVE2OTHER ); } +#line 6719 "configparser.cc" /* yacc.c:1646 */ break; - case 706: -/* Line 1792 of yacc.c */ -#line 1237 "configparser.yy" + case 709: +#line 1241 "configparser.yy" /* yacc.c:1646 */ { ((EnterDirOp*)lconfig_fp1)->setMode( EnterDirOp::ENTERDIROP_SPECIAL ); } +#line 6725 "configparser.cc" /* yacc.c:1646 */ break; - case 708: -/* Line 1792 of yacc.c */ -#line 1238 "configparser.yy" + case 711: +#line 1242 "configparser.yy" /* yacc.c:1646 */ { ((EnterDirOp*)lconfig_fp1)->setMode( EnterDirOp::ENTERDIROP_REQUEST ); } +#line 6731 "configparser.cc" /* yacc.c:1646 */ break; - case 711: -/* Line 1792 of yacc.c */ -#line 1241 "configparser.yy" + case 714: +#line 1245 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChangeListerSetOp(); } +#line 6737 "configparser.cc" /* yacc.c:1646 */ break; - case 712: -/* Line 1792 of yacc.c */ -#line 1242 "configparser.yy" + case 715: +#line 1246 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6743 "configparser.cc" /* yacc.c:1646 */ break; - case 713: -/* Line 1792 of yacc.c */ -#line 1244 "configparser.yy" + case 716: +#line 1248 "configparser.yy" /* yacc.c:1646 */ { ((ChangeListerSetOp*)lconfig_fp1)->setMode( ChangeListerSetOp::CLS_LEFT_LISTER ); } +#line 6749 "configparser.cc" /* yacc.c:1646 */ break; - case 715: -/* Line 1792 of yacc.c */ -#line 1245 "configparser.yy" + case 718: +#line 1249 "configparser.yy" /* yacc.c:1646 */ { ((ChangeListerSetOp*)lconfig_fp1)->setMode( ChangeListerSetOp::CLS_RIGHT_LISTER ); } +#line 6755 "configparser.cc" /* yacc.c:1646 */ break; - case 717: -/* Line 1792 of yacc.c */ -#line 1246 "configparser.yy" + case 720: +#line 1250 "configparser.yy" /* yacc.c:1646 */ { ((ChangeListerSetOp*)lconfig_fp1)->setMode( ChangeListerSetOp::CLS_CURRENT_LISTER ); } +#line 6761 "configparser.cc" /* yacc.c:1646 */ break; - case 719: -/* Line 1792 of yacc.c */ -#line 1247 "configparser.yy" + case 722: +#line 1251 "configparser.yy" /* yacc.c:1646 */ { ((ChangeListerSetOp*)lconfig_fp1)->setMode( ChangeListerSetOp::CLS_OTHER_LISTER ); } +#line 6767 "configparser.cc" /* yacc.c:1646 */ break; - case 722: -/* Line 1792 of yacc.c */ -#line 1250 "configparser.yy" + case 725: +#line 1254 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SwitchListerOp(); } +#line 6773 "configparser.cc" /* yacc.c:1646 */ break; - case 723: -/* Line 1792 of yacc.c */ -#line 1251 "configparser.yy" + case 726: +#line 1255 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6779 "configparser.cc" /* yacc.c:1646 */ break; - case 724: -/* Line 1792 of yacc.c */ -#line 1253 "configparser.yy" + case 727: +#line 1257 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new FilterSelectOp(); } +#line 6785 "configparser.cc" /* yacc.c:1646 */ break; - case 725: -/* Line 1792 of yacc.c */ -#line 1254 "configparser.yy" + case 728: +#line 1258 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6791 "configparser.cc" /* yacc.c:1646 */ break; - case 726: -/* Line 1792 of yacc.c */ -#line 1256 "configparser.yy" - { ((FilterSelectOp*)lconfig_fp1)->setFilter( (yyvsp[(3) - (4)].strptr) ); } + case 729: +#line 1260 "configparser.yy" /* yacc.c:1646 */ + { ((FilterSelectOp*)lconfig_fp1)->setFilter( (yyvsp[-1].strptr) ); } +#line 6797 "configparser.cc" /* yacc.c:1646 */ break; - case 729: -/* Line 1792 of yacc.c */ -#line 1259 "configparser.yy" + case 732: +#line 1263 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new FilterUnSelectOp(); } +#line 6803 "configparser.cc" /* yacc.c:1646 */ break; - case 730: -/* Line 1792 of yacc.c */ -#line 1260 "configparser.yy" + case 733: +#line 1264 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6809 "configparser.cc" /* yacc.c:1646 */ break; - case 731: -/* Line 1792 of yacc.c */ -#line 1262 "configparser.yy" - { ((FilterUnSelectOp*)lconfig_fp1)->setFilter( (yyvsp[(3) - (4)].strptr) ); } + case 734: +#line 1266 "configparser.yy" /* yacc.c:1646 */ + { ((FilterUnSelectOp*)lconfig_fp1)->setFilter( (yyvsp[-1].strptr) ); } +#line 6815 "configparser.cc" /* yacc.c:1646 */ break; - case 734: -/* Line 1792 of yacc.c */ -#line 1265 "configparser.yy" + case 737: +#line 1269 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new Path2OSideOp(); } +#line 6821 "configparser.cc" /* yacc.c:1646 */ break; - case 735: -/* Line 1792 of yacc.c */ -#line 1266 "configparser.yy" + case 738: +#line 1270 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6827 "configparser.cc" /* yacc.c:1646 */ break; - case 736: -/* Line 1792 of yacc.c */ -#line 1268 "configparser.yy" + case 739: +#line 1272 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new QuitOp(); } +#line 6833 "configparser.cc" /* yacc.c:1646 */ break; - case 737: -/* Line 1792 of yacc.c */ -#line 1269 "configparser.yy" + case 740: +#line 1273 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6839 "configparser.cc" /* yacc.c:1646 */ break; - case 738: -/* Line 1792 of yacc.c */ -#line 1271 "configparser.yy" + case 741: +#line 1275 "configparser.yy" /* yacc.c:1646 */ { ((QuitOp*)lconfig_fp1)->setMode( QuitOp::Q_NORMAL_QUIT ); } +#line 6845 "configparser.cc" /* yacc.c:1646 */ break; - case 740: -/* Line 1792 of yacc.c */ -#line 1272 "configparser.yy" + case 743: +#line 1276 "configparser.yy" /* yacc.c:1646 */ { ((QuitOp*)lconfig_fp1)->setMode( QuitOp::Q_QUICK_QUIT ); } +#line 6851 "configparser.cc" /* yacc.c:1646 */ break; - case 743: -/* Line 1792 of yacc.c */ -#line 1275 "configparser.yy" + case 746: +#line 1279 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new DeleteOp(); } +#line 6857 "configparser.cc" /* yacc.c:1646 */ break; - case 744: -/* Line 1792 of yacc.c */ -#line 1276 "configparser.yy" + case 747: +#line 1280 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6863 "configparser.cc" /* yacc.c:1646 */ break; - case 745: -/* Line 1792 of yacc.c */ -#line 1278 "configparser.yy" - { ((DeleteOp*)lconfig_fp1)->setAlsoActive( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 748: +#line 1282 "configparser.yy" /* yacc.c:1646 */ + { ((DeleteOp*)lconfig_fp1)->setAlsoActive( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6869 "configparser.cc" /* yacc.c:1646 */ break; - case 748: -/* Line 1792 of yacc.c */ -#line 1281 "configparser.yy" + case 751: +#line 1285 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ReloadOp(); } +#line 6875 "configparser.cc" /* yacc.c:1646 */ break; - case 749: -/* Line 1792 of yacc.c */ -#line 1282 "configparser.yy" + case 752: +#line 1286 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6881 "configparser.cc" /* yacc.c:1646 */ break; - case 750: -/* Line 1792 of yacc.c */ -#line 1284 "configparser.yy" + case 753: +#line 1288 "configparser.yy" /* yacc.c:1646 */ { ((ReloadOp*)lconfig_fp1)->setReloadside( ReloadOp::RELOADOP_LEFTSIDE ); } +#line 6887 "configparser.cc" /* yacc.c:1646 */ break; - case 752: -/* Line 1792 of yacc.c */ -#line 1285 "configparser.yy" + case 755: +#line 1289 "configparser.yy" /* yacc.c:1646 */ { ((ReloadOp*)lconfig_fp1)->setReloadside( ReloadOp::RELOADOP_RIGHTSIDE ); } +#line 6893 "configparser.cc" /* yacc.c:1646 */ break; - case 754: -/* Line 1792 of yacc.c */ -#line 1286 "configparser.yy" + case 757: +#line 1290 "configparser.yy" /* yacc.c:1646 */ { ((ReloadOp*)lconfig_fp1)->setReloadside( ReloadOp::RELOADOP_THISSIDE ); } +#line 6899 "configparser.cc" /* yacc.c:1646 */ break; - case 756: -/* Line 1792 of yacc.c */ -#line 1287 "configparser.yy" + case 759: +#line 1291 "configparser.yy" /* yacc.c:1646 */ { ((ReloadOp*)lconfig_fp1)->setReloadside( ReloadOp::RELOADOP_OTHERSIDE ); } +#line 6905 "configparser.cc" /* yacc.c:1646 */ break; - case 758: -/* Line 1792 of yacc.c */ -#line 1288 "configparser.yy" - { ((ReloadOp*)lconfig_fp1)->setResetDirSizes( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 761: +#line 1292 "configparser.yy" /* yacc.c:1646 */ + { ((ReloadOp*)lconfig_fp1)->setResetDirSizes( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6911 "configparser.cc" /* yacc.c:1646 */ break; - case 760: -/* Line 1792 of yacc.c */ -#line 1289 "configparser.yy" - { ((ReloadOp*)lconfig_fp1)->setKeepFiletypes( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 763: +#line 1293 "configparser.yy" /* yacc.c:1646 */ + { ((ReloadOp*)lconfig_fp1)->setKeepFiletypes( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 6917 "configparser.cc" /* yacc.c:1646 */ break; - case 763: -/* Line 1792 of yacc.c */ -#line 1292 "configparser.yy" + case 766: +#line 1296 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new MakeDirOp(); } +#line 6923 "configparser.cc" /* yacc.c:1646 */ break; - case 764: -/* Line 1792 of yacc.c */ -#line 1293 "configparser.yy" + case 767: +#line 1297 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6929 "configparser.cc" /* yacc.c:1646 */ break; - case 765: -/* Line 1792 of yacc.c */ -#line 1295 "configparser.yy" + case 768: +#line 1299 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new RenameOp(); } +#line 6935 "configparser.cc" /* yacc.c:1646 */ break; - case 766: -/* Line 1792 of yacc.c */ -#line 1296 "configparser.yy" + case 769: +#line 1300 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6941 "configparser.cc" /* yacc.c:1646 */ break; - case 767: -/* Line 1792 of yacc.c */ -#line 1298 "configparser.yy" + case 770: +#line 1302 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new DirSizeOp(); } +#line 6947 "configparser.cc" /* yacc.c:1646 */ break; - case 768: -/* Line 1792 of yacc.c */ -#line 1299 "configparser.yy" + case 771: +#line 1303 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6953 "configparser.cc" /* yacc.c:1646 */ break; - case 769: -/* Line 1792 of yacc.c */ -#line 1301 "configparser.yy" + case 772: +#line 1305 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SimDDOp(); } +#line 6959 "configparser.cc" /* yacc.c:1646 */ break; - case 770: -/* Line 1792 of yacc.c */ -#line 1302 "configparser.yy" + case 773: +#line 1306 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6965 "configparser.cc" /* yacc.c:1646 */ break; - case 771: -/* Line 1792 of yacc.c */ -#line 1304 "configparser.yy" + case 774: +#line 1308 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new StartProgOp(); } +#line 6971 "configparser.cc" /* yacc.c:1646 */ break; - case 772: -/* Line 1792 of yacc.c */ -#line 1305 "configparser.yy" + case 775: +#line 1309 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 6977 "configparser.cc" /* yacc.c:1646 */ break; - case 773: -/* Line 1792 of yacc.c */ -#line 1307 "configparser.yy" + case 776: +#line 1311 "configparser.yy" /* yacc.c:1646 */ { ((StartProgOp*)lconfig_fp1)->setStart( StartProgOp::STARTPROGOP_START_IN_TERMINAL ); } +#line 6983 "configparser.cc" /* yacc.c:1646 */ break; - case 775: -/* Line 1792 of yacc.c */ -#line 1308 "configparser.yy" + case 778: +#line 1312 "configparser.yy" /* yacc.c:1646 */ { ((StartProgOp*)lconfig_fp1)->setStart( StartProgOp::STARTPROGOP_START_IN_TERMINAL_AND_WAIT4KEY ); } +#line 6989 "configparser.cc" /* yacc.c:1646 */ break; - case 777: -/* Line 1792 of yacc.c */ -#line 1309 "configparser.yy" + case 780: +#line 1313 "configparser.yy" /* yacc.c:1646 */ { ((StartProgOp*)lconfig_fp1)->setStart( StartProgOp::STARTPROGOP_SHOW_OUTPUT ); } +#line 6995 "configparser.cc" /* yacc.c:1646 */ break; - case 779: -/* Line 1792 of yacc.c */ -#line 1310 "configparser.yy" + case 782: +#line 1314 "configparser.yy" /* yacc.c:1646 */ { ((StartProgOp*)lconfig_fp1)->setStart( StartProgOp::STARTPROGOP_SHOW_OUTPUT_INT ); } +#line 7001 "configparser.cc" /* yacc.c:1646 */ break; - case 781: -/* Line 1792 of yacc.c */ -#line 1311 "configparser.yy" + case 784: +#line 1315 "configparser.yy" /* yacc.c:1646 */ { ((StartProgOp*)lconfig_fp1)->setStart( StartProgOp::STARTPROGOP_START_NORMAL ); } +#line 7007 "configparser.cc" /* yacc.c:1646 */ break; - case 783: -/* Line 1792 of yacc.c */ -#line 1312 "configparser.yy" - { ((StartProgOp*)lconfig_fp1)->setViewStr( (yyvsp[(3) - (4)].strptr) ); } + case 786: +#line 1316 "configparser.yy" /* yacc.c:1646 */ + { ((StartProgOp*)lconfig_fp1)->setViewStr( (yyvsp[-1].strptr) ); } +#line 7013 "configparser.cc" /* yacc.c:1646 */ break; - case 785: -/* Line 1792 of yacc.c */ -#line 1313 "configparser.yy" - { ((StartProgOp*)lconfig_fp1)->setGlobal( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 788: +#line 1317 "configparser.yy" /* yacc.c:1646 */ + { ((StartProgOp*)lconfig_fp1)->setGlobal( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7019 "configparser.cc" /* yacc.c:1646 */ break; - case 787: -/* Line 1792 of yacc.c */ -#line 1314 "configparser.yy" - { ((StartProgOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 790: +#line 1318 "configparser.yy" /* yacc.c:1646 */ + { ((StartProgOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7025 "configparser.cc" /* yacc.c:1646 */ break; - case 789: -/* Line 1792 of yacc.c */ -#line 1315 "configparser.yy" - { ((StartProgOp*)lconfig_fp1)->setInBackground( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 792: +#line 1319 "configparser.yy" /* yacc.c:1646 */ + { ((StartProgOp*)lconfig_fp1)->setInBackground( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7031 "configparser.cc" /* yacc.c:1646 */ break; - case 791: -/* Line 1792 of yacc.c */ -#line 1316 "configparser.yy" - { ((StartProgOp*)lconfig_fp1)->setDontCD( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 794: +#line 1320 "configparser.yy" /* yacc.c:1646 */ + { ((StartProgOp*)lconfig_fp1)->setDontCD( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7037 "configparser.cc" /* yacc.c:1646 */ break; - case 794: -/* Line 1792 of yacc.c */ -#line 1319 "configparser.yy" + case 797: +#line 1323 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SearchEntryOp(); } +#line 7043 "configparser.cc" /* yacc.c:1646 */ break; - case 795: -/* Line 1792 of yacc.c */ -#line 1320 "configparser.yy" + case 798: +#line 1324 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7049 "configparser.cc" /* yacc.c:1646 */ break; - case 796: -/* Line 1792 of yacc.c */ -#line 1322 "configparser.yy" - { ((SearchEntryOp*)lconfig_fp1)->setIgnoreCase( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 799: +#line 1326 "configparser.yy" /* yacc.c:1646 */ + { ((SearchEntryOp*)lconfig_fp1)->setIgnoreCase( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7055 "configparser.cc" /* yacc.c:1646 */ break; - case 798: -/* Line 1792 of yacc.c */ -#line 1323 "configparser.yy" - { ((SearchEntryOp*)lconfig_fp1)->setReverseSearch( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 801: +#line 1327 "configparser.yy" /* yacc.c:1646 */ + { ((SearchEntryOp*)lconfig_fp1)->setReverseSearch( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7061 "configparser.cc" /* yacc.c:1646 */ break; - case 800: -/* Line 1792 of yacc.c */ -#line 1324 "configparser.yy" - { ((SearchEntryOp*)lconfig_fp1)->setInfixSearch( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 803: +#line 1328 "configparser.yy" /* yacc.c:1646 */ + { ((SearchEntryOp*)lconfig_fp1)->setInfixSearch( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7067 "configparser.cc" /* yacc.c:1646 */ break; - case 802: -/* Line 1792 of yacc.c */ -#line 1325 "configparser.yy" - { ((SearchEntryOp*)lconfig_fp1)->setFlexibleMatch( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 805: +#line 1329 "configparser.yy" /* yacc.c:1646 */ + { ((SearchEntryOp*)lconfig_fp1)->setFlexibleMatch( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7073 "configparser.cc" /* yacc.c:1646 */ break; - case 805: -/* Line 1792 of yacc.c */ -#line 1328 "configparser.yy" + case 808: +#line 1332 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new EnterPathOp(); } +#line 7079 "configparser.cc" /* yacc.c:1646 */ break; - case 806: -/* Line 1792 of yacc.c */ -#line 1329 "configparser.yy" + case 809: +#line 1333 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7085 "configparser.cc" /* yacc.c:1646 */ break; - case 807: -/* Line 1792 of yacc.c */ -#line 1331 "configparser.yy" + case 810: +#line 1335 "configparser.yy" /* yacc.c:1646 */ { ((EnterPathOp*)lconfig_fp1)->setSide( EnterPathOp::ENTERPATHOP_LEFTSIDE ); } +#line 7091 "configparser.cc" /* yacc.c:1646 */ break; - case 809: -/* Line 1792 of yacc.c */ -#line 1332 "configparser.yy" + case 812: +#line 1336 "configparser.yy" /* yacc.c:1646 */ { ((EnterPathOp*)lconfig_fp1)->setSide( EnterPathOp::ENTERPATHOP_RIGHTSIDE ); } +#line 7097 "configparser.cc" /* yacc.c:1646 */ break; - case 811: -/* Line 1792 of yacc.c */ -#line 1333 "configparser.yy" + case 814: +#line 1337 "configparser.yy" /* yacc.c:1646 */ { ((EnterPathOp*)lconfig_fp1)->setSide( EnterPathOp::ENTERPATHOP_THISSIDE ); } +#line 7103 "configparser.cc" /* yacc.c:1646 */ break; - case 813: -/* Line 1792 of yacc.c */ -#line 1334 "configparser.yy" + case 816: +#line 1338 "configparser.yy" /* yacc.c:1646 */ { ((EnterPathOp*)lconfig_fp1)->setSide( EnterPathOp::ENTERPATHOP_OTHERSIDE ); } +#line 7109 "configparser.cc" /* yacc.c:1646 */ break; - case 816: -/* Line 1792 of yacc.c */ -#line 1337 "configparser.yy" + case 819: +#line 1341 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ScrollListerOp(); } +#line 7115 "configparser.cc" /* yacc.c:1646 */ break; - case 817: -/* Line 1792 of yacc.c */ -#line 1338 "configparser.yy" + case 820: +#line 1342 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7121 "configparser.cc" /* yacc.c:1646 */ break; - case 818: -/* Line 1792 of yacc.c */ -#line 1340 "configparser.yy" + case 821: +#line 1344 "configparser.yy" /* yacc.c:1646 */ { ((ScrollListerOp*)lconfig_fp1)->setDir( ScrollListerOp::SCROLLLISTEROP_LEFT ); } +#line 7127 "configparser.cc" /* yacc.c:1646 */ break; - case 820: -/* Line 1792 of yacc.c */ -#line 1341 "configparser.yy" + case 823: +#line 1345 "configparser.yy" /* yacc.c:1646 */ { ((ScrollListerOp*)lconfig_fp1)->setDir( ScrollListerOp::SCROLLLISTEROP_RIGHT ); } +#line 7133 "configparser.cc" /* yacc.c:1646 */ break; - case 823: -/* Line 1792 of yacc.c */ -#line 1344 "configparser.yy" + case 826: +#line 1348 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new CreateSymlinkOp(); } +#line 7139 "configparser.cc" /* yacc.c:1646 */ break; - case 824: -/* Line 1792 of yacc.c */ -#line 1345 "configparser.yy" + case 827: +#line 1349 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7145 "configparser.cc" /* yacc.c:1646 */ break; - case 825: -/* Line 1792 of yacc.c */ -#line 1347 "configparser.yy" - { ((CreateSymlinkOp*)lconfig_fp1)->setSameDir( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 828: +#line 1351 "configparser.yy" /* yacc.c:1646 */ + { ((CreateSymlinkOp*)lconfig_fp1)->setSameDir( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7151 "configparser.cc" /* yacc.c:1646 */ break; - case 827: -/* Line 1792 of yacc.c */ -#line 1348 "configparser.yy" - { ((CreateSymlinkOp*)lconfig_fp1)->setLocal( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 830: +#line 1352 "configparser.yy" /* yacc.c:1646 */ + { ((CreateSymlinkOp*)lconfig_fp1)->setLocal( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7157 "configparser.cc" /* yacc.c:1646 */ break; - case 829: -/* Line 1792 of yacc.c */ -#line 1349 "configparser.yy" - { ((CreateSymlinkOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 832: +#line 1353 "configparser.yy" /* yacc.c:1646 */ + { ((CreateSymlinkOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7163 "configparser.cc" /* yacc.c:1646 */ break; - case 832: -/* Line 1792 of yacc.c */ -#line 1352 "configparser.yy" + case 835: +#line 1356 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChangeSymlinkOp(); } +#line 7169 "configparser.cc" /* yacc.c:1646 */ break; - case 833: -/* Line 1792 of yacc.c */ -#line 1353 "configparser.yy" + case 836: +#line 1357 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7175 "configparser.cc" /* yacc.c:1646 */ break; - case 834: -/* Line 1792 of yacc.c */ -#line 1355 "configparser.yy" + case 837: +#line 1359 "configparser.yy" /* yacc.c:1646 */ { ((ChangeSymlinkOp*)lconfig_fp1)->setMode( ChangeSymlinkOp::CHANGESYMLINK_EDIT ); } +#line 7181 "configparser.cc" /* yacc.c:1646 */ break; - case 836: -/* Line 1792 of yacc.c */ -#line 1356 "configparser.yy" + case 839: +#line 1360 "configparser.yy" /* yacc.c:1646 */ { ((ChangeSymlinkOp*)lconfig_fp1)->setMode( ChangeSymlinkOp::CHANGESYMLINK_MAKE_ABSOLUTE ); } +#line 7187 "configparser.cc" /* yacc.c:1646 */ break; - case 838: -/* Line 1792 of yacc.c */ -#line 1357 "configparser.yy" + case 841: +#line 1361 "configparser.yy" /* yacc.c:1646 */ { ((ChangeSymlinkOp*)lconfig_fp1)->setMode( ChangeSymlinkOp::CHANGESYMLINK_MAKE_RELATIVE ); } +#line 7193 "configparser.cc" /* yacc.c:1646 */ break; - case 841: -/* Line 1792 of yacc.c */ -#line 1360 "configparser.yy" + case 844: +#line 1364 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChModOp(); } +#line 7199 "configparser.cc" /* yacc.c:1646 */ break; - case 842: -/* Line 1792 of yacc.c */ -#line 1361 "configparser.yy" + case 845: +#line 1365 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7205 "configparser.cc" /* yacc.c:1646 */ break; - case 843: -/* Line 1792 of yacc.c */ -#line 1363 "configparser.yy" - { ((ChModOp*)lconfig_fp1)->setOnFiles( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 846: +#line 1367 "configparser.yy" /* yacc.c:1646 */ + { ((ChModOp*)lconfig_fp1)->setOnFiles( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7211 "configparser.cc" /* yacc.c:1646 */ break; - case 845: -/* Line 1792 of yacc.c */ -#line 1364 "configparser.yy" - { ((ChModOp*)lconfig_fp1)->setOnDirs( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 848: +#line 1368 "configparser.yy" /* yacc.c:1646 */ + { ((ChModOp*)lconfig_fp1)->setOnDirs( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7217 "configparser.cc" /* yacc.c:1646 */ break; - case 847: -/* Line 1792 of yacc.c */ -#line 1365 "configparser.yy" - { ((ChModOp*)lconfig_fp1)->setRecursive( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 850: +#line 1369 "configparser.yy" /* yacc.c:1646 */ + { ((ChModOp*)lconfig_fp1)->setRecursive( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7223 "configparser.cc" /* yacc.c:1646 */ break; - case 849: -/* Line 1792 of yacc.c */ -#line 1366 "configparser.yy" - { ((ChModOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 852: +#line 1370 "configparser.yy" /* yacc.c:1646 */ + { ((ChModOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7229 "configparser.cc" /* yacc.c:1646 */ break; - case 852: -/* Line 1792 of yacc.c */ -#line 1369 "configparser.yy" + case 855: +#line 1373 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChTimeOp(); } +#line 7235 "configparser.cc" /* yacc.c:1646 */ break; - case 853: -/* Line 1792 of yacc.c */ -#line 1370 "configparser.yy" + case 856: +#line 1374 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7241 "configparser.cc" /* yacc.c:1646 */ break; - case 854: -/* Line 1792 of yacc.c */ -#line 1372 "configparser.yy" - { ((ChTimeOp*)lconfig_fp1)->setOnFiles( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 857: +#line 1376 "configparser.yy" /* yacc.c:1646 */ + { ((ChTimeOp*)lconfig_fp1)->setOnFiles( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7247 "configparser.cc" /* yacc.c:1646 */ break; - case 856: -/* Line 1792 of yacc.c */ -#line 1373 "configparser.yy" - { ((ChTimeOp*)lconfig_fp1)->setOnDirs( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 859: +#line 1377 "configparser.yy" /* yacc.c:1646 */ + { ((ChTimeOp*)lconfig_fp1)->setOnDirs( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7253 "configparser.cc" /* yacc.c:1646 */ break; - case 858: -/* Line 1792 of yacc.c */ -#line 1374 "configparser.yy" - { ((ChTimeOp*)lconfig_fp1)->setRecursive( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 861: +#line 1378 "configparser.yy" /* yacc.c:1646 */ + { ((ChTimeOp*)lconfig_fp1)->setRecursive( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7259 "configparser.cc" /* yacc.c:1646 */ break; - case 860: -/* Line 1792 of yacc.c */ -#line 1375 "configparser.yy" - { ((ChTimeOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 863: +#line 1379 "configparser.yy" /* yacc.c:1646 */ + { ((ChTimeOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7265 "configparser.cc" /* yacc.c:1646 */ break; - case 863: -/* Line 1792 of yacc.c */ -#line 1378 "configparser.yy" + case 866: +#line 1382 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ToggleListermodeOp(); } +#line 7271 "configparser.cc" /* yacc.c:1646 */ break; - case 864: -/* Line 1792 of yacc.c */ -#line 1379 "configparser.yy" + case 867: +#line 1383 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7277 "configparser.cc" /* yacc.c:1646 */ break; - case 865: -/* Line 1792 of yacc.c */ -#line 1381 "configparser.yy" - { ((ToggleListermodeOp*)lconfig_fp1)->setMode( Worker::getID4Name( (yyvsp[(3) - (4)].strptr) ) ); } + case 868: +#line 1385 "configparser.yy" /* yacc.c:1646 */ + { ((ToggleListermodeOp*)lconfig_fp1)->setMode( Worker::getID4Name( (yyvsp[-1].strptr) ) ); } +#line 7283 "configparser.cc" /* yacc.c:1646 */ break; - case 868: -/* Line 1792 of yacc.c */ -#line 1384 "configparser.yy" + case 871: +#line 1388 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SetSortmodeOp(); ((SetSortmodeOp*)lconfig_fp1)->setMode( 0 ); } +#line 7291 "configparser.cc" /* yacc.c:1646 */ break; - case 869: -/* Line 1792 of yacc.c */ -#line 1387 "configparser.yy" + case 872: +#line 1391 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7297 "configparser.cc" /* yacc.c:1646 */ break; - case 870: -/* Line 1792 of yacc.c */ -#line 1389 "configparser.yy" + case 873: +#line 1393 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_NAME ); } +#line 7303 "configparser.cc" /* yacc.c:1646 */ break; - case 872: -/* Line 1792 of yacc.c */ -#line 1390 "configparser.yy" + case 875: +#line 1394 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_SIZE ); } +#line 7309 "configparser.cc" /* yacc.c:1646 */ break; - case 874: -/* Line 1792 of yacc.c */ -#line 1391 "configparser.yy" + case 877: +#line 1395 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_ACCTIME ); } +#line 7315 "configparser.cc" /* yacc.c:1646 */ break; - case 876: -/* Line 1792 of yacc.c */ -#line 1392 "configparser.yy" + case 879: +#line 1396 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_MODTIME ); } +#line 7321 "configparser.cc" /* yacc.c:1646 */ break; - case 878: -/* Line 1792 of yacc.c */ -#line 1393 "configparser.yy" + case 881: +#line 1397 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_CHGTIME ); } +#line 7327 "configparser.cc" /* yacc.c:1646 */ break; - case 880: -/* Line 1792 of yacc.c */ -#line 1394 "configparser.yy" + case 883: +#line 1398 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_TYPE ); } +#line 7333 "configparser.cc" /* yacc.c:1646 */ break; - case 882: -/* Line 1792 of yacc.c */ -#line 1395 "configparser.yy" + case 885: +#line 1399 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_OWNER ); } +#line 7339 "configparser.cc" /* yacc.c:1646 */ break; - case 884: -/* Line 1792 of yacc.c */ -#line 1396 "configparser.yy" + case 887: +#line 1400 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_INODE ); } +#line 7345 "configparser.cc" /* yacc.c:1646 */ break; - case 886: -/* Line 1792 of yacc.c */ -#line 1397 "configparser.yy" + case 889: +#line 1401 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_NLINK ); } +#line 7351 "configparser.cc" /* yacc.c:1646 */ break; - case 888: -/* Line 1792 of yacc.c */ -#line 1398 "configparser.yy" + case 891: +#line 1402 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortby( SORT_PERMISSION ); } +#line 7357 "configparser.cc" /* yacc.c:1646 */ break; - case 890: -/* Line 1792 of yacc.c */ -#line 1399 "configparser.yy" + case 893: +#line 1403 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortFlag( SORT_REVERSE ); } +#line 7363 "configparser.cc" /* yacc.c:1646 */ break; - case 892: -/* Line 1792 of yacc.c */ -#line 1400 "configparser.yy" + case 895: +#line 1404 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortFlag( SORT_DIRLAST ); } +#line 7369 "configparser.cc" /* yacc.c:1646 */ break; - case 894: -/* Line 1792 of yacc.c */ -#line 1401 "configparser.yy" + case 897: +#line 1405 "configparser.yy" /* yacc.c:1646 */ { ((SetSortmodeOp*)lconfig_fp1)->setSortFlag( SORT_DIRMIXED ); } +#line 7375 "configparser.cc" /* yacc.c:1646 */ break; - case 897: -/* Line 1792 of yacc.c */ -#line 1404 "configparser.yy" + case 900: +#line 1408 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SetFilterOp(); } +#line 7381 "configparser.cc" /* yacc.c:1646 */ break; - case 898: -/* Line 1792 of yacc.c */ -#line 1405 "configparser.yy" + case 901: +#line 1409 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7387 "configparser.cc" /* yacc.c:1646 */ break; - case 899: -/* Line 1792 of yacc.c */ -#line 1407 "configparser.yy" - { ((SetFilterOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 902: +#line 1411 "configparser.yy" /* yacc.c:1646 */ + { ((SetFilterOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7393 "configparser.cc" /* yacc.c:1646 */ break; - case 901: -/* Line 1792 of yacc.c */ -#line 1408 "configparser.yy" + case 904: +#line 1412 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setFiltermode( SetFilterOp::EXCLUDE_FILTER ); } +#line 7399 "configparser.cc" /* yacc.c:1646 */ break; - case 903: -/* Line 1792 of yacc.c */ -#line 1409 "configparser.yy" + case 906: +#line 1413 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setFiltermode( SetFilterOp::INCLUDE_FILTER ); } +#line 7405 "configparser.cc" /* yacc.c:1646 */ break; - case 905: -/* Line 1792 of yacc.c */ -#line 1410 "configparser.yy" + case 908: +#line 1414 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setFiltermode( SetFilterOp::UNSET_FILTER ); } +#line 7411 "configparser.cc" /* yacc.c:1646 */ break; - case 907: -/* Line 1792 of yacc.c */ -#line 1411 "configparser.yy" + case 910: +#line 1415 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setFiltermode( SetFilterOp::UNSET_ALL ); } +#line 7417 "configparser.cc" /* yacc.c:1646 */ break; - case 909: -/* Line 1792 of yacc.c */ -#line 1412 "configparser.yy" - { ((SetFilterOp*)lconfig_fp1)->setFilter( (yyvsp[(3) - (4)].strptr) ); } + case 912: +#line 1416 "configparser.yy" /* yacc.c:1646 */ + { ((SetFilterOp*)lconfig_fp1)->setFilter( (yyvsp[-1].strptr) ); } +#line 7423 "configparser.cc" /* yacc.c:1646 */ break; - case 911: -/* Line 1792 of yacc.c */ -#line 1413 "configparser.yy" - { ((SetFilterOp*)lconfig_fp1)->setBookmarkLabel( (yyvsp[(3) - (4)].strptr) ); } + case 914: +#line 1417 "configparser.yy" /* yacc.c:1646 */ + { ((SetFilterOp*)lconfig_fp1)->setBookmarkLabel( (yyvsp[-1].strptr) ); } +#line 7429 "configparser.cc" /* yacc.c:1646 */ break; - case 913: -/* Line 1792 of yacc.c */ -#line 1414 "configparser.yy" + case 916: +#line 1418 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setBookmarkFilter( DirFilterSettings::SHOW_ONLY_BOOKMARKS ); } +#line 7435 "configparser.cc" /* yacc.c:1646 */ break; - case 915: -/* Line 1792 of yacc.c */ -#line 1415 "configparser.yy" + case 918: +#line 1419 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setBookmarkFilter( DirFilterSettings::SHOW_ONLY_LABEL ); } +#line 7441 "configparser.cc" /* yacc.c:1646 */ break; - case 917: -/* Line 1792 of yacc.c */ -#line 1416 "configparser.yy" + case 920: +#line 1420 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setBookmarkFilter( DirFilterSettings::SHOW_ALL ); } +#line 7447 "configparser.cc" /* yacc.c:1646 */ break; - case 919: -/* Line 1792 of yacc.c */ -#line 1417 "configparser.yy" + case 922: +#line 1421 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setOptionMode( SetFilterOp::SET_OPTION ); } +#line 7453 "configparser.cc" /* yacc.c:1646 */ break; - case 921: -/* Line 1792 of yacc.c */ -#line 1418 "configparser.yy" + case 924: +#line 1422 "configparser.yy" /* yacc.c:1646 */ { ((SetFilterOp*)lconfig_fp1)->setOptionMode( SetFilterOp::INVERT_OPTION ); } +#line 7459 "configparser.cc" /* yacc.c:1646 */ break; - case 923: -/* Line 1792 of yacc.c */ -#line 1419 "configparser.yy" - { ((SetFilterOp*)lconfig_fp1)->setChangeFilters( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } - break; - - case 925: -/* Line 1792 of yacc.c */ -#line 1420 "configparser.yy" - { ((SetFilterOp*)lconfig_fp1)->setChangeBookmarks( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } - break; - - case 927: -/* Line 1792 of yacc.c */ -#line 1421 "configparser.yy" - { ((SetFilterOp*)lconfig_fp1)->setQueryLabel( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 926: +#line 1423 "configparser.yy" /* yacc.c:1646 */ + { ((SetFilterOp*)lconfig_fp1)->setChangeFilters( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7465 "configparser.cc" /* yacc.c:1646 */ + break; + + case 928: +#line 1424 "configparser.yy" /* yacc.c:1646 */ + { ((SetFilterOp*)lconfig_fp1)->setChangeBookmarks( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7471 "configparser.cc" /* yacc.c:1646 */ break; case 930: -/* Line 1792 of yacc.c */ -#line 1424 "configparser.yy" +#line 1425 "configparser.yy" /* yacc.c:1646 */ + { ((SetFilterOp*)lconfig_fp1)->setQueryLabel( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7477 "configparser.cc" /* yacc.c:1646 */ + break; + + case 933: +#line 1428 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ShortkeyFromListOp(); } +#line 7483 "configparser.cc" /* yacc.c:1646 */ break; - case 931: -/* Line 1792 of yacc.c */ -#line 1425 "configparser.yy" + case 934: +#line 1429 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7489 "configparser.cc" /* yacc.c:1646 */ break; - case 932: -/* Line 1792 of yacc.c */ -#line 1427 "configparser.yy" + case 935: +#line 1431 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChOwnOp(); } +#line 7495 "configparser.cc" /* yacc.c:1646 */ break; - case 933: -/* Line 1792 of yacc.c */ -#line 1428 "configparser.yy" + case 936: +#line 1432 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7501 "configparser.cc" /* yacc.c:1646 */ break; - case 934: -/* Line 1792 of yacc.c */ -#line 1430 "configparser.yy" - { ((ChOwnOp*)lconfig_fp1)->setOnFiles( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 937: +#line 1434 "configparser.yy" /* yacc.c:1646 */ + { ((ChOwnOp*)lconfig_fp1)->setOnFiles( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7507 "configparser.cc" /* yacc.c:1646 */ break; - case 936: -/* Line 1792 of yacc.c */ -#line 1431 "configparser.yy" - { ((ChOwnOp*)lconfig_fp1)->setOnDirs( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 939: +#line 1435 "configparser.yy" /* yacc.c:1646 */ + { ((ChOwnOp*)lconfig_fp1)->setOnDirs( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7513 "configparser.cc" /* yacc.c:1646 */ break; - case 938: -/* Line 1792 of yacc.c */ -#line 1432 "configparser.yy" - { ((ChOwnOp*)lconfig_fp1)->setRecursive( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 941: +#line 1436 "configparser.yy" /* yacc.c:1646 */ + { ((ChOwnOp*)lconfig_fp1)->setRecursive( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7519 "configparser.cc" /* yacc.c:1646 */ break; - case 940: -/* Line 1792 of yacc.c */ -#line 1433 "configparser.yy" - { ((ChOwnOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 943: +#line 1437 "configparser.yy" /* yacc.c:1646 */ + { ((ChOwnOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7525 "configparser.cc" /* yacc.c:1646 */ break; - case 943: -/* Line 1792 of yacc.c */ -#line 1436 "configparser.yy" + case 946: +#line 1440 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ScriptOp(); } +#line 7531 "configparser.cc" /* yacc.c:1646 */ break; - case 944: -/* Line 1792 of yacc.c */ -#line 1437 "configparser.yy" + case 947: +#line 1441 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7537 "configparser.cc" /* yacc.c:1646 */ break; - case 945: -/* Line 1792 of yacc.c */ -#line 1439 "configparser.yy" + case 948: +#line 1443 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_NOP ); } +#line 7543 "configparser.cc" /* yacc.c:1646 */ break; - case 947: -/* Line 1792 of yacc.c */ -#line 1440 "configparser.yy" + case 950: +#line 1444 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_PUSH ); } +#line 7549 "configparser.cc" /* yacc.c:1646 */ break; - case 949: -/* Line 1792 of yacc.c */ -#line 1441 "configparser.yy" + case 952: +#line 1445 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_LABEL ); } +#line 7555 "configparser.cc" /* yacc.c:1646 */ break; - case 951: -/* Line 1792 of yacc.c */ -#line 1442 "configparser.yy" + case 954: +#line 1446 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_IF ); } +#line 7561 "configparser.cc" /* yacc.c:1646 */ break; - case 953: -/* Line 1792 of yacc.c */ -#line 1443 "configparser.yy" + case 956: +#line 1447 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_END ); } +#line 7567 "configparser.cc" /* yacc.c:1646 */ break; - case 955: -/* Line 1792 of yacc.c */ -#line 1444 "configparser.yy" + case 958: +#line 1448 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_POP ); } +#line 7573 "configparser.cc" /* yacc.c:1646 */ break; - case 957: -/* Line 1792 of yacc.c */ -#line 1445 "configparser.yy" + case 960: +#line 1449 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_SETTINGS ); } +#line 7579 "configparser.cc" /* yacc.c:1646 */ break; - case 959: -/* Line 1792 of yacc.c */ -#line 1446 "configparser.yy" + case 962: +#line 1450 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_WINDOW ); } +#line 7585 "configparser.cc" /* yacc.c:1646 */ break; - case 961: -/* Line 1792 of yacc.c */ -#line 1447 "configparser.yy" + case 964: +#line 1451 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_GOTO ); } +#line 7591 "configparser.cc" /* yacc.c:1646 */ break; - case 963: -/* Line 1792 of yacc.c */ -#line 1448 "configparser.yy" + case 966: +#line 1452 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setType( ScriptOp::SCRIPT_EVALCOMMAND ); } +#line 7597 "configparser.cc" /* yacc.c:1646 */ break; - case 965: -/* Line 1792 of yacc.c */ -#line 1449 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setPushUseOutput( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 968: +#line 1453 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setPushUseOutput( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7603 "configparser.cc" /* yacc.c:1646 */ break; - case 967: -/* Line 1792 of yacc.c */ -#line 1450 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setDoDebug( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 970: +#line 1454 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setDoDebug( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7609 "configparser.cc" /* yacc.c:1646 */ break; - case 969: -/* Line 1792 of yacc.c */ -#line 1451 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setWPURecursive( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 972: +#line 1455 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setWPURecursive( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7615 "configparser.cc" /* yacc.c:1646 */ break; - case 971: -/* Line 1792 of yacc.c */ -#line 1452 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setWPUTakeDirs( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 974: +#line 1456 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setWPUTakeDirs( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7621 "configparser.cc" /* yacc.c:1646 */ break; - case 973: -/* Line 1792 of yacc.c */ -#line 1453 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setStackNr( (yyvsp[(3) - (4)].num) ); } + case 976: +#line 1457 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setStackNr( (yyvsp[-1].num) ); } +#line 7627 "configparser.cc" /* yacc.c:1646 */ break; - case 975: -/* Line 1792 of yacc.c */ -#line 1454 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setLabel( (yyvsp[(3) - (4)].strptr) ); } + case 978: +#line 1458 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setLabel( (yyvsp[-1].strptr) ); } +#line 7633 "configparser.cc" /* yacc.c:1646 */ break; - case 977: -/* Line 1792 of yacc.c */ -#line 1455 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setPushString( (yyvsp[(3) - (4)].strptr) ); } + case 980: +#line 1459 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setPushString( (yyvsp[-1].strptr) ); } +#line 7639 "configparser.cc" /* yacc.c:1646 */ break; - case 979: -/* Line 1792 of yacc.c */ -#line 1456 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setIfTest( (yyvsp[(3) - (4)].strptr) ); } + case 982: +#line 1460 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setIfTest( (yyvsp[-1].strptr) ); } +#line 7645 "configparser.cc" /* yacc.c:1646 */ break; - case 981: -/* Line 1792 of yacc.c */ -#line 1457 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setIfLabel( (yyvsp[(3) - (4)].strptr) ); } + case 984: +#line 1461 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setIfLabel( (yyvsp[-1].strptr) ); } +#line 7651 "configparser.cc" /* yacc.c:1646 */ break; - case 983: -/* Line 1792 of yacc.c */ -#line 1458 "configparser.yy" + case 986: +#line 1462 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setWinType( ScriptOp::SCRIPT_WINDOW_OPEN ); } +#line 7657 "configparser.cc" /* yacc.c:1646 */ break; - case 985: -/* Line 1792 of yacc.c */ -#line 1459 "configparser.yy" + case 988: +#line 1463 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setWinType( ScriptOp::SCRIPT_WINDOW_CLOSE ); } +#line 7663 "configparser.cc" /* yacc.c:1646 */ break; - case 987: -/* Line 1792 of yacc.c */ -#line 1460 "configparser.yy" + case 990: +#line 1464 "configparser.yy" /* yacc.c:1646 */ { ((ScriptOp*)lconfig_fp1)->setWinType( ScriptOp::SCRIPT_WINDOW_LEAVE ); } +#line 7669 "configparser.cc" /* yacc.c:1646 */ break; - case 989: -/* Line 1792 of yacc.c */ -#line 1461 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setChangeProgress( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 992: +#line 1465 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setChangeProgress( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7675 "configparser.cc" /* yacc.c:1646 */ break; - case 991: -/* Line 1792 of yacc.c */ -#line 1462 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setChangeText( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 994: +#line 1466 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setChangeText( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7681 "configparser.cc" /* yacc.c:1646 */ break; - case 993: -/* Line 1792 of yacc.c */ -#line 1463 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setProgressUseOutput( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 996: +#line 1467 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setProgressUseOutput( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7687 "configparser.cc" /* yacc.c:1646 */ break; - case 995: -/* Line 1792 of yacc.c */ -#line 1464 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setWinTextUseOutput( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 998: +#line 1468 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setWinTextUseOutput( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7693 "configparser.cc" /* yacc.c:1646 */ break; - case 997: -/* Line 1792 of yacc.c */ -#line 1465 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setProgress( (yyvsp[(3) - (4)].strptr) ); } + case 1000: +#line 1469 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setProgress( (yyvsp[-1].strptr) ); } +#line 7699 "configparser.cc" /* yacc.c:1646 */ break; - case 999: -/* Line 1792 of yacc.c */ -#line 1466 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setWinText( (yyvsp[(3) - (4)].strptr) ); } + case 1002: +#line 1470 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setWinText( (yyvsp[-1].strptr) ); } +#line 7705 "configparser.cc" /* yacc.c:1646 */ break; - case 1001: -/* Line 1792 of yacc.c */ -#line 1467 "configparser.yy" - { ((ScriptOp*)lconfig_fp1)->setCommandStr( (yyvsp[(3) - (4)].strptr) ); } + case 1004: +#line 1471 "configparser.yy" /* yacc.c:1646 */ + { ((ScriptOp*)lconfig_fp1)->setCommandStr( (yyvsp[-1].strptr) ); } +#line 7711 "configparser.cc" /* yacc.c:1646 */ break; - case 1004: -/* Line 1792 of yacc.c */ -#line 1470 "configparser.yy" + case 1007: +#line 1474 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ShowDirCacheOp(); } +#line 7717 "configparser.cc" /* yacc.c:1646 */ break; - case 1005: -/* Line 1792 of yacc.c */ -#line 1471 "configparser.yy" + case 1008: +#line 1475 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7723 "configparser.cc" /* yacc.c:1646 */ break; - case 1006: -/* Line 1792 of yacc.c */ -#line 1473 "configparser.yy" + case 1009: +#line 1477 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ParentActionOp(); } +#line 7729 "configparser.cc" /* yacc.c:1646 */ break; - case 1007: -/* Line 1792 of yacc.c */ -#line 1474 "configparser.yy" + case 1010: +#line 1478 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7735 "configparser.cc" /* yacc.c:1646 */ break; - case 1008: -/* Line 1792 of yacc.c */ -#line 1476 "configparser.yy" + case 1011: +#line 1480 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new NoOperationOp(); } +#line 7741 "configparser.cc" /* yacc.c:1646 */ break; - case 1009: -/* Line 1792 of yacc.c */ -#line 1477 "configparser.yy" + case 1012: +#line 1481 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7747 "configparser.cc" /* yacc.c:1646 */ break; - case 1010: -/* Line 1792 of yacc.c */ -#line 1479 "configparser.yy" + case 1013: +#line 1483 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new GoFTPOp(); } +#line 7753 "configparser.cc" /* yacc.c:1646 */ break; - case 1011: -/* Line 1792 of yacc.c */ -#line 1480 "configparser.yy" + case 1014: +#line 1484 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7759 "configparser.cc" /* yacc.c:1646 */ break; - case 1012: -/* Line 1792 of yacc.c */ -#line 1482 "configparser.yy" - { ((GoFTPOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1015: +#line 1486 "configparser.yy" /* yacc.c:1646 */ + { ((GoFTPOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7765 "configparser.cc" /* yacc.c:1646 */ break; - case 1014: -/* Line 1792 of yacc.c */ -#line 1483 "configparser.yy" - { ((GoFTPOp*)lconfig_fp1)->setHost( (yyvsp[(3) - (4)].strptr) ); } + case 1017: +#line 1487 "configparser.yy" /* yacc.c:1646 */ + { ((GoFTPOp*)lconfig_fp1)->setHost( (yyvsp[-1].strptr) ); } +#line 7771 "configparser.cc" /* yacc.c:1646 */ break; - case 1016: -/* Line 1792 of yacc.c */ -#line 1484 "configparser.yy" - { ((GoFTPOp*)lconfig_fp1)->setUser( (yyvsp[(3) - (4)].strptr) ); } + case 1019: +#line 1488 "configparser.yy" /* yacc.c:1646 */ + { ((GoFTPOp*)lconfig_fp1)->setUser( (yyvsp[-1].strptr) ); } +#line 7777 "configparser.cc" /* yacc.c:1646 */ break; - case 1018: -/* Line 1792 of yacc.c */ -#line 1485 "configparser.yy" - { ((GoFTPOp*)lconfig_fp1)->setPass( (yyvsp[(3) - (4)].strptr) ); } + case 1021: +#line 1489 "configparser.yy" /* yacc.c:1646 */ + { ((GoFTPOp*)lconfig_fp1)->setPass( (yyvsp[-1].strptr) ); } +#line 7783 "configparser.cc" /* yacc.c:1646 */ break; - case 1020: -/* Line 1792 of yacc.c */ -#line 1486 "configparser.yy" - { ((GoFTPOp*)lconfig_fp1)->setDontEnterFTP( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1023: +#line 1490 "configparser.yy" /* yacc.c:1646 */ + { ((GoFTPOp*)lconfig_fp1)->setDontEnterFTP( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7789 "configparser.cc" /* yacc.c:1646 */ break; - case 1022: -/* Line 1792 of yacc.c */ -#line 1487 "configparser.yy" - { ((GoFTPOp*)lconfig_fp1)->setAlwaysStorePW( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1025: +#line 1491 "configparser.yy" /* yacc.c:1646 */ + { ((GoFTPOp*)lconfig_fp1)->setAlwaysStorePW( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7795 "configparser.cc" /* yacc.c:1646 */ break; - case 1024: -/* Line 1792 of yacc.c */ -#line 1488 "configparser.yy" - { ((GoFTPOp*)lconfig_fp1)->setAVFSModule( (yyvsp[(3) - (4)].strptr) ); } + case 1027: +#line 1492 "configparser.yy" /* yacc.c:1646 */ + { ((GoFTPOp*)lconfig_fp1)->setAVFSModule( (yyvsp[-1].strptr) ); } +#line 7801 "configparser.cc" /* yacc.c:1646 */ break; - case 1027: -/* Line 1792 of yacc.c */ -#line 1491 "configparser.yy" + case 1030: +#line 1495 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new InternalViewOp(); } +#line 7807 "configparser.cc" /* yacc.c:1646 */ break; - case 1028: -/* Line 1792 of yacc.c */ -#line 1492 "configparser.yy" + case 1031: +#line 1496 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7813 "configparser.cc" /* yacc.c:1646 */ break; - case 1029: -/* Line 1792 of yacc.c */ -#line 1494 "configparser.yy" - { ((InternalViewOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1032: +#line 1498 "configparser.yy" /* yacc.c:1646 */ + { ((InternalViewOp*)lconfig_fp1)->setRequestFlags( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7819 "configparser.cc" /* yacc.c:1646 */ break; - case 1031: -/* Line 1792 of yacc.c */ -#line 1495 "configparser.yy" - { ((InternalViewOp*)lconfig_fp1)->setCustomFiles( (yyvsp[(3) - (4)].strptr) ); } + case 1034: +#line 1499 "configparser.yy" /* yacc.c:1646 */ + { ((InternalViewOp*)lconfig_fp1)->setCustomFiles( (yyvsp[-1].strptr) ); } +#line 7825 "configparser.cc" /* yacc.c:1646 */ break; - case 1033: -/* Line 1792 of yacc.c */ -#line 1496 "configparser.yy" + case 1036: +#line 1500 "configparser.yy" /* yacc.c:1646 */ { ((InternalViewOp*)lconfig_fp1)->setShowFileMode( InternalViewOp::SHOW_ACTIVE_FILE ); } +#line 7831 "configparser.cc" /* yacc.c:1646 */ break; - case 1035: -/* Line 1792 of yacc.c */ -#line 1497 "configparser.yy" + case 1038: +#line 1501 "configparser.yy" /* yacc.c:1646 */ { ((InternalViewOp*)lconfig_fp1)->setShowFileMode( InternalViewOp::SHOW_CUSTOM_FILES ); } +#line 7837 "configparser.cc" /* yacc.c:1646 */ break; - case 1038: -/* Line 1792 of yacc.c */ -#line 1501 "configparser.yy" + case 1041: +#line 1505 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ClipboardOp(); } +#line 7843 "configparser.cc" /* yacc.c:1646 */ break; - case 1039: -/* Line 1792 of yacc.c */ -#line 1502 "configparser.yy" + case 1042: +#line 1506 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7849 "configparser.cc" /* yacc.c:1646 */ break; - case 1040: -/* Line 1792 of yacc.c */ -#line 1504 "configparser.yy" - { ((ClipboardOp*)lconfig_fp1)->setClipboardString( (yyvsp[(3) - (4)].strptr) ); } + case 1043: +#line 1508 "configparser.yy" /* yacc.c:1646 */ + { ((ClipboardOp*)lconfig_fp1)->setClipboardString( (yyvsp[-1].strptr) ); } +#line 7855 "configparser.cc" /* yacc.c:1646 */ break; - case 1043: -/* Line 1792 of yacc.c */ -#line 1507 "configparser.yy" + case 1046: +#line 1511 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SearchOp(); } +#line 7861 "configparser.cc" /* yacc.c:1646 */ break; - case 1044: -/* Line 1792 of yacc.c */ -#line 1508 "configparser.yy" + case 1047: +#line 1512 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7867 "configparser.cc" /* yacc.c:1646 */ break; - case 1045: -/* Line 1792 of yacc.c */ -#line 1510 "configparser.yy" - { ((SearchOp*)lconfig_fp1)->setEditCommand( (yyvsp[(3) - (4)].strptr) ); } + case 1048: +#line 1514 "configparser.yy" /* yacc.c:1646 */ + { ((SearchOp*)lconfig_fp1)->setEditCommand( (yyvsp[-1].strptr) ); } +#line 7873 "configparser.cc" /* yacc.c:1646 */ break; - case 1047: -/* Line 1792 of yacc.c */ -#line 1511 "configparser.yy" - { ((SearchOp*)lconfig_fp1)->setShowPrevResults( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1050: +#line 1515 "configparser.yy" /* yacc.c:1646 */ + { ((SearchOp*)lconfig_fp1)->setShowPrevResults( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7879 "configparser.cc" /* yacc.c:1646 */ break; - case 1050: -/* Line 1792 of yacc.c */ -#line 1514 "configparser.yy" + case 1053: +#line 1518 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new DirBookmarkOp(); } +#line 7885 "configparser.cc" /* yacc.c:1646 */ break; - case 1051: -/* Line 1792 of yacc.c */ -#line 1515 "configparser.yy" + case 1054: +#line 1519 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7891 "configparser.cc" /* yacc.c:1646 */ break; - case 1052: -/* Line 1792 of yacc.c */ -#line 1517 "configparser.yy" + case 1055: +#line 1521 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new OpenContextMenuOp(); } +#line 7897 "configparser.cc" /* yacc.c:1646 */ break; - case 1053: -/* Line 1792 of yacc.c */ -#line 1518 "configparser.yy" + case 1056: +#line 1522 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7903 "configparser.cc" /* yacc.c:1646 */ break; - case 1054: -/* Line 1792 of yacc.c */ -#line 1520 "configparser.yy" - { ((OpenContextMenuOp*)lconfig_fp1)->setHighlightUserAction( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1057: +#line 1524 "configparser.yy" /* yacc.c:1646 */ + { ((OpenContextMenuOp*)lconfig_fp1)->setHighlightUserAction( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7909 "configparser.cc" /* yacc.c:1646 */ break; - case 1057: -/* Line 1792 of yacc.c */ -#line 1523 "configparser.yy" + case 1060: +#line 1527 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new RunCustomAction(); } +#line 7915 "configparser.cc" /* yacc.c:1646 */ break; - case 1058: -/* Line 1792 of yacc.c */ -#line 1524 "configparser.yy" + case 1061: +#line 1528 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7921 "configparser.cc" /* yacc.c:1646 */ break; - case 1059: -/* Line 1792 of yacc.c */ -#line 1526 "configparser.yy" - { ((RunCustomAction*)lconfig_fp1)->setCustomName( (yyvsp[(3) - (4)].strptr) ); } + case 1062: +#line 1530 "configparser.yy" /* yacc.c:1646 */ + { ((RunCustomAction*)lconfig_fp1)->setCustomName( (yyvsp[-1].strptr) ); } +#line 7927 "configparser.cc" /* yacc.c:1646 */ break; - case 1062: -/* Line 1792 of yacc.c */ -#line 1529 "configparser.yy" + case 1065: +#line 1533 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new OpenWorkerMenuOp(); } +#line 7933 "configparser.cc" /* yacc.c:1646 */ break; - case 1063: -/* Line 1792 of yacc.c */ -#line 1530 "configparser.yy" + case 1066: +#line 1534 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7939 "configparser.cc" /* yacc.c:1646 */ break; - case 1064: -/* Line 1792 of yacc.c */ -#line 1532 "configparser.yy" + case 1067: +#line 1536 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChangeLabelOp(); } +#line 7945 "configparser.cc" /* yacc.c:1646 */ break; - case 1065: -/* Line 1792 of yacc.c */ -#line 1533 "configparser.yy" + case 1068: +#line 1537 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7951 "configparser.cc" /* yacc.c:1646 */ break; - case 1066: -/* Line 1792 of yacc.c */ -#line 1535 "configparser.yy" - { ((ChangeLabelOp*)lconfig_fp1)->setAskForLabel( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1069: +#line 1539 "configparser.yy" /* yacc.c:1646 */ + { ((ChangeLabelOp*)lconfig_fp1)->setAskForLabel( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 7957 "configparser.cc" /* yacc.c:1646 */ break; - case 1068: -/* Line 1792 of yacc.c */ -#line 1536 "configparser.yy" - { ((ChangeLabelOp*)lconfig_fp1)->setLabel( (yyvsp[(3) - (4)].strptr) ); } + case 1071: +#line 1540 "configparser.yy" /* yacc.c:1646 */ + { ((ChangeLabelOp*)lconfig_fp1)->setLabel( (yyvsp[-1].strptr) ); } +#line 7963 "configparser.cc" /* yacc.c:1646 */ break; - case 1071: -/* Line 1792 of yacc.c */ -#line 1539 "configparser.yy" + case 1074: +#line 1543 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ModifyTabsOp(); } +#line 7969 "configparser.cc" /* yacc.c:1646 */ break; - case 1072: -/* Line 1792 of yacc.c */ -#line 1540 "configparser.yy" + case 1075: +#line 1544 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 7975 "configparser.cc" /* yacc.c:1646 */ break; - case 1073: -/* Line 1792 of yacc.c */ -#line 1542 "configparser.yy" + case 1076: +#line 1546 "configparser.yy" /* yacc.c:1646 */ { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::NEW_TAB ); } +#line 7981 "configparser.cc" /* yacc.c:1646 */ break; - case 1075: -/* Line 1792 of yacc.c */ -#line 1543 "configparser.yy" + case 1078: +#line 1547 "configparser.yy" /* yacc.c:1646 */ { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::CLOSE_CURRENT_TAB ); } +#line 7987 "configparser.cc" /* yacc.c:1646 */ break; - case 1077: -/* Line 1792 of yacc.c */ -#line 1544 "configparser.yy" + case 1080: +#line 1548 "configparser.yy" /* yacc.c:1646 */ { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::NEXT_TAB ); } +#line 7993 "configparser.cc" /* yacc.c:1646 */ break; - case 1079: -/* Line 1792 of yacc.c */ -#line 1545 "configparser.yy" + case 1082: +#line 1549 "configparser.yy" /* yacc.c:1646 */ { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::PREV_TAB ); } +#line 7999 "configparser.cc" /* yacc.c:1646 */ break; - case 1082: -/* Line 1792 of yacc.c */ -#line 1548 "configparser.yy" + case 1084: +#line 1550 "configparser.yy" /* yacc.c:1646 */ + { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::TOGGLE_LOCK_STATE ); } +#line 8005 "configparser.cc" /* yacc.c:1646 */ + break; + + case 1086: +#line 1551 "configparser.yy" /* yacc.c:1646 */ + { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::MOVE_TAB_LEFT ); } +#line 8011 "configparser.cc" /* yacc.c:1646 */ + break; + + case 1088: +#line 1552 "configparser.yy" /* yacc.c:1646 */ + { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::MOVE_TAB_RIGHT ); } +#line 8017 "configparser.cc" /* yacc.c:1646 */ + break; + + case 1091: +#line 1555 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChangeLayoutOp(); layout_sets = LayoutSettings(); } +#line 8026 "configparser.cc" /* yacc.c:1646 */ break; - case 1083: -/* Line 1792 of yacc.c */ -#line 1551 "configparser.yy" + case 1092: +#line 1558 "configparser.yy" /* yacc.c:1646 */ { ((ChangeLayoutOp*)lconfig_fp1)->setLayout( layout_sets ); lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8035 "configparser.cc" /* yacc.c:1646 */ break; - case 1084: -/* Line 1792 of yacc.c */ -#line 1556 "configparser.yy" + case 1093: +#line 1563 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_STATEBAR ); } +#line 8041 "configparser.cc" /* yacc.c:1646 */ break; - case 1086: -/* Line 1792 of yacc.c */ -#line 1557 "configparser.yy" + case 1095: +#line 1564 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_CLOCKBAR ); } +#line 8047 "configparser.cc" /* yacc.c:1646 */ break; - case 1088: -/* Line 1792 of yacc.c */ -#line 1558 "configparser.yy" + case 1097: +#line 1565 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_BUTTONS ); } +#line 8053 "configparser.cc" /* yacc.c:1646 */ break; - case 1090: -/* Line 1792 of yacc.c */ -#line 1559 "configparser.yy" + case 1099: +#line 1566 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_LISTVIEWS ); } +#line 8059 "configparser.cc" /* yacc.c:1646 */ break; - case 1092: -/* Line 1792 of yacc.c */ -#line 1560 "configparser.yy" + case 1101: +#line 1567 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_BLL ); } +#line 8065 "configparser.cc" /* yacc.c:1646 */ break; - case 1094: -/* Line 1792 of yacc.c */ -#line 1561 "configparser.yy" + case 1103: +#line 1568 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_LBL ); } +#line 8071 "configparser.cc" /* yacc.c:1646 */ break; - case 1096: -/* Line 1792 of yacc.c */ -#line 1562 "configparser.yy" + case 1105: +#line 1569 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_LLB ); } +#line 8077 "configparser.cc" /* yacc.c:1646 */ break; - case 1098: -/* Line 1792 of yacc.c */ -#line 1563 "configparser.yy" + case 1107: +#line 1570 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_BL ); } +#line 8083 "configparser.cc" /* yacc.c:1646 */ break; - case 1100: -/* Line 1792 of yacc.c */ -#line 1564 "configparser.yy" + case 1109: +#line 1571 "configparser.yy" /* yacc.c:1646 */ { layout_sets.pushBackOrder( LayoutSettings::LO_LB ); } +#line 8089 "configparser.cc" /* yacc.c:1646 */ break; - case 1102: -/* Line 1792 of yacc.c */ -#line 1565 "configparser.yy" - { layout_sets.setButtonVert( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1111: +#line 1572 "configparser.yy" /* yacc.c:1646 */ + { layout_sets.setButtonVert( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 8095 "configparser.cc" /* yacc.c:1646 */ break; - case 1104: -/* Line 1792 of yacc.c */ -#line 1566 "configparser.yy" - { layout_sets.setListViewVert( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1113: +#line 1573 "configparser.yy" /* yacc.c:1646 */ + { layout_sets.setListViewVert( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 8101 "configparser.cc" /* yacc.c:1646 */ break; - case 1106: -/* Line 1792 of yacc.c */ -#line 1567 "configparser.yy" - { layout_sets.setListViewWeight( (yyvsp[(3) - (4)].num) ); } + case 1115: +#line 1574 "configparser.yy" /* yacc.c:1646 */ + { layout_sets.setListViewWeight( (yyvsp[-1].num) ); } +#line 8107 "configparser.cc" /* yacc.c:1646 */ break; - case 1108: -/* Line 1792 of yacc.c */ -#line 1568 "configparser.yy" - { layout_sets.setWeightRelToActive( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1117: +#line 1575 "configparser.yy" /* yacc.c:1646 */ + { layout_sets.setWeightRelToActive( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 8113 "configparser.cc" /* yacc.c:1646 */ break; - case 1111: -/* Line 1792 of yacc.c */ -#line 1571 "configparser.yy" + case 1120: +#line 1578 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ChangeColumnsOp(); columns.clear(); } +#line 8122 "configparser.cc" /* yacc.c:1646 */ break; - case 1112: -/* Line 1792 of yacc.c */ -#line 1574 "configparser.yy" + case 1121: +#line 1581 "configparser.yy" /* yacc.c:1646 */ { ((ChangeColumnsOp*)lconfig_fp1)->setColumns( columns ); lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8131 "configparser.cc" /* yacc.c:1646 */ break; - case 1113: -/* Line 1792 of yacc.c */ -#line 1579 "configparser.yy" + case 1122: +#line 1586 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_NAME ); } +#line 8137 "configparser.cc" /* yacc.c:1646 */ break; - case 1115: -/* Line 1792 of yacc.c */ -#line 1580 "configparser.yy" + case 1124: +#line 1587 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_SIZE ); } +#line 8143 "configparser.cc" /* yacc.c:1646 */ break; - case 1117: -/* Line 1792 of yacc.c */ -#line 1581 "configparser.yy" + case 1126: +#line 1588 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_TYPE ); } +#line 8149 "configparser.cc" /* yacc.c:1646 */ break; - case 1119: -/* Line 1792 of yacc.c */ -#line 1582 "configparser.yy" + case 1128: +#line 1589 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_PERM ); } +#line 8155 "configparser.cc" /* yacc.c:1646 */ break; - case 1121: -/* Line 1792 of yacc.c */ -#line 1583 "configparser.yy" + case 1130: +#line 1590 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_OWNER ); } +#line 8161 "configparser.cc" /* yacc.c:1646 */ break; - case 1123: -/* Line 1792 of yacc.c */ -#line 1584 "configparser.yy" + case 1132: +#line 1591 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_DEST ); } +#line 8167 "configparser.cc" /* yacc.c:1646 */ break; - case 1125: -/* Line 1792 of yacc.c */ -#line 1585 "configparser.yy" + case 1134: +#line 1592 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_MOD ); } +#line 8173 "configparser.cc" /* yacc.c:1646 */ break; - case 1127: -/* Line 1792 of yacc.c */ -#line 1586 "configparser.yy" + case 1136: +#line 1593 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_ACC ); } +#line 8179 "configparser.cc" /* yacc.c:1646 */ break; - case 1129: -/* Line 1792 of yacc.c */ -#line 1587 "configparser.yy" + case 1138: +#line 1594 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_CHANGE ); } +#line 8185 "configparser.cc" /* yacc.c:1646 */ break; - case 1131: -/* Line 1792 of yacc.c */ -#line 1588 "configparser.yy" + case 1140: +#line 1595 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_INODE ); } +#line 8191 "configparser.cc" /* yacc.c:1646 */ break; - case 1133: -/* Line 1792 of yacc.c */ -#line 1589 "configparser.yy" + case 1142: +#line 1596 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_NLINK ); } +#line 8197 "configparser.cc" /* yacc.c:1646 */ break; - case 1135: -/* Line 1792 of yacc.c */ -#line 1590 "configparser.yy" + case 1144: +#line 1597 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_BLOCKS ); } +#line 8203 "configparser.cc" /* yacc.c:1646 */ break; - case 1137: -/* Line 1792 of yacc.c */ -#line 1591 "configparser.yy" + case 1146: +#line 1598 "configparser.yy" /* yacc.c:1646 */ { columns.push_back( WorkerTypes::LISTCOL_SIZEH ); } +#line 8209 "configparser.cc" /* yacc.c:1646 */ break; - case 1140: -/* Line 1792 of yacc.c */ -#line 1594 "configparser.yy" + case 1149: +#line 1601 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new VolumeManagerOp(); } +#line 8215 "configparser.cc" /* yacc.c:1646 */ break; - case 1141: -/* Line 1792 of yacc.c */ -#line 1595 "configparser.yy" + case 1150: +#line 1602 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8221 "configparser.cc" /* yacc.c:1646 */ break; - case 1142: -/* Line 1792 of yacc.c */ -#line 1597 "configparser.yy" + case 1151: +#line 1604 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new SwitchButtonBankOp(); } +#line 8227 "configparser.cc" /* yacc.c:1646 */ break; - case 1143: -/* Line 1792 of yacc.c */ -#line 1598 "configparser.yy" + case 1152: +#line 1605 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8233 "configparser.cc" /* yacc.c:1646 */ break; - case 1144: -/* Line 1792 of yacc.c */ -#line 1600 "configparser.yy" + case 1153: +#line 1607 "configparser.yy" /* yacc.c:1646 */ { ((SwitchButtonBankOp*)lconfig_fp1)->setSwitchMode( SwitchButtonBankOp::SWITCH_TO_NEXT_BANK ); } +#line 8239 "configparser.cc" /* yacc.c:1646 */ break; - case 1146: -/* Line 1792 of yacc.c */ -#line 1601 "configparser.yy" + case 1155: +#line 1608 "configparser.yy" /* yacc.c:1646 */ { ((SwitchButtonBankOp*)lconfig_fp1)->setSwitchMode( SwitchButtonBankOp::SWITCH_TO_PREV_BANK ); } +#line 8245 "configparser.cc" /* yacc.c:1646 */ break; - case 1148: -/* Line 1792 of yacc.c */ -#line 1602 "configparser.yy" + case 1157: +#line 1609 "configparser.yy" /* yacc.c:1646 */ { ((SwitchButtonBankOp*)lconfig_fp1)->setSwitchMode( SwitchButtonBankOp::SWITCH_TO_BANK_NR ); } +#line 8251 "configparser.cc" /* yacc.c:1646 */ break; - case 1150: -/* Line 1792 of yacc.c */ -#line 1603 "configparser.yy" - { ((SwitchButtonBankOp*)lconfig_fp1)->setBankNr( (yyvsp[(3) - (4)].num) ); } + case 1159: +#line 1610 "configparser.yy" /* yacc.c:1646 */ + { ((SwitchButtonBankOp*)lconfig_fp1)->setBankNr( (yyvsp[-1].num) ); } +#line 8257 "configparser.cc" /* yacc.c:1646 */ break; - case 1153: -/* Line 1792 of yacc.c */ -#line 1606 "configparser.yy" + case 1162: +#line 1613 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new PathJumpOp(); } +#line 8263 "configparser.cc" /* yacc.c:1646 */ break; - case 1154: -/* Line 1792 of yacc.c */ -#line 1607 "configparser.yy" + case 1163: +#line 1614 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8269 "configparser.cc" /* yacc.c:1646 */ break; - case 1155: -/* Line 1792 of yacc.c */ -#line 1609 "configparser.yy" + case 1164: +#line 1616 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new CommandMenuOp(); } +#line 8275 "configparser.cc" /* yacc.c:1646 */ break; - case 1156: -/* Line 1792 of yacc.c */ -#line 1610 "configparser.yy" + case 1165: +#line 1617 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8281 "configparser.cc" /* yacc.c:1646 */ break; - case 1157: -/* Line 1792 of yacc.c */ -#line 1612 "configparser.yy" - { ((CommandMenuOp*)lconfig_fp1)->setShowRecentlyUsed( ( ( (yyvsp[(3) - (4)].num) ) == 1 ) ? true : false ); } + case 1166: +#line 1619 "configparser.yy" /* yacc.c:1646 */ + { ((CommandMenuOp*)lconfig_fp1)->setShowRecentlyUsed( ( ( (yyvsp[-1].num) ) == 1 ) ? true : false ); } +#line 8287 "configparser.cc" /* yacc.c:1646 */ break; - case 1160: -/* Line 1792 of yacc.c */ -#line 1615 "configparser.yy" + case 1169: +#line 1622 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ViewNewestFilesOp(); } +#line 8293 "configparser.cc" /* yacc.c:1646 */ break; - case 1161: -/* Line 1792 of yacc.c */ -#line 1616 "configparser.yy" + case 1170: +#line 1623 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8299 "configparser.cc" /* yacc.c:1646 */ break; - case 1162: -/* Line 1792 of yacc.c */ -#line 1618 "configparser.yy" + case 1171: +#line 1625 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new DirCompareOp(); } +#line 8305 "configparser.cc" /* yacc.c:1646 */ break; - case 1163: -/* Line 1792 of yacc.c */ -#line 1619 "configparser.yy" + case 1172: +#line 1626 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8311 "configparser.cc" /* yacc.c:1646 */ break; - case 1164: -/* Line 1792 of yacc.c */ -#line 1621 "configparser.yy" + case 1173: +#line 1628 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new TabProfilesOp(); } +#line 8317 "configparser.cc" /* yacc.c:1646 */ break; - case 1165: -/* Line 1792 of yacc.c */ -#line 1622 "configparser.yy" + case 1174: +#line 1629 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8323 "configparser.cc" /* yacc.c:1646 */ break; - case 1166: -/* Line 1792 of yacc.c */ -#line 1624 "configparser.yy" + case 1175: +#line 1631 "configparser.yy" /* yacc.c:1646 */ { lconfig_fp1 = new ExternalVDirOp(); } +#line 8329 "configparser.cc" /* yacc.c:1646 */ break; - case 1167: -/* Line 1792 of yacc.c */ -#line 1625 "configparser.yy" + case 1176: +#line 1632 "configparser.yy" /* yacc.c:1646 */ { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8335 "configparser.cc" /* yacc.c:1646 */ + break; + + case 1177: +#line 1634 "configparser.yy" /* yacc.c:1646 */ + { ((ExternalVDirOp*)lconfig_fp1)->setCommandString( (yyvsp[-1].strptr) ); } +#line 8341 "configparser.cc" /* yacc.c:1646 */ + break; + + case 1180: +#line 1637 "configparser.yy" /* yacc.c:1646 */ + { lconfig_fp1 = new OpenTabMenuOp(); } +#line 8347 "configparser.cc" /* yacc.c:1646 */ break; - case 1168: -/* Line 1792 of yacc.c */ -#line 1627 "configparser.yy" - { ((ExternalVDirOp*)lconfig_fp1)->setCommandString( (yyvsp[(3) - (4)].strptr) ); } + case 1181: +#line 1638 "configparser.yy" /* yacc.c:1646 */ + { lconfig_listcom->addElement( lconfig_fp1 ); } +#line 8353 "configparser.cc" /* yacc.c:1646 */ break; -/* Line 1792 of yacc.c */ -#line 8953 "configparser.cc" +#line 8357 "configparser.cc" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -8971,7 +8375,7 @@ *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -8986,9 +8390,9 @@ goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -9039,20 +8443,20 @@ if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -9071,7 +8475,7 @@ if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -9084,29 +8488,29 @@ | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + yystos[yystate], yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -9157,14 +8561,14 @@ yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + yystos[*yyssp], yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow @@ -9175,13 +8579,9 @@ if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - -/* Line 2055 of yacc.c */ -#line 1630 "configparser.yy" +#line 1640 "configparser.yy" /* yacc.c:1906 */ /**/ int yymyparse(void) diff -Nru worker-3.14.0/src/configparser.hh worker-3.15.4/src/configparser.hh --- worker-3.14.0/src/configparser.hh 2017-12-08 22:28:40.000000000 +0000 +++ worker-3.15.4/src/configparser.hh 2019-01-28 21:41:43.000000000 +0000 @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + This program 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 3 of the License, or (at your option) any later version. - + This program 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 this program. If not, see . */ @@ -26,13 +26,13 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ #ifndef YY_YY_CONFIGPARSER_HH_INCLUDED # define YY_YY_CONFIGPARSER_HH_INCLUDED -/* Enabling traces. */ +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 #endif @@ -40,431 +40,435 @@ extern int yydebug; #endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - LEFTBRACE_WCP = 258, - RIGHTBRACE_WCP = 259, - GLOBAL_WCP = 260, - COLORS_WCP = 261, - LANG_WCP = 262, - PALETTE_WCP = 263, - OWNOP_WCP = 264, - LISTERSETS_WCP = 265, - YES_WCP = 266, - NO_WCP = 267, - LEFT_WCP = 268, - RIGHT_WCP = 269, - HBARTOP_WCP = 270, - HBARHEIGHT_WCP = 271, - VBARLEFT_WCP = 272, - VBARWIDTH_WCP = 273, - DISPLAYSETS_WCP = 274, - NAME_WCP = 275, - SIZE_WCP = 276, - TYPE_WCP = 277, - PERMISSION_WCP = 278, - OWNER_WCP = 279, - DESTINATION_WCP = 280, - MODTIME_WCP = 281, - ACCTIME_WCP = 282, - CHGTIME_WCP = 283, - ROWS_WCP = 284, - COLUMNS_WCP = 285, - CACHESIZE_WCP = 286, - OWNERSTYLE_WCP = 287, - TERMINAL_WCP = 288, - USESTRINGFORDIRSIZE_WCP = 289, - TIMESETS_WCP = 290, - STYLE1_WCP = 291, - STYLE2_WCP = 292, - STYLE3_WCP = 293, - DATE_WCP = 294, - TIME_WCP = 295, - DATESUBSTITUTION_WCP = 296, - DATEBEFORETIME_WCP = 297, - STATEBAR_WCP = 298, - SELLVBAR_WCP = 299, - UNSELLVBAR_WCP = 300, - CLOCKBAR_WCP = 301, - REQUESTER_WCP = 302, - UNSELDIR_WCP = 303, - SELDIR_WCP = 304, - UNSELFILE_WCP = 305, - SELFILE_WCP = 306, - UNSELACTDIR_WCP = 307, - SELACTDIR_WCP = 308, - UNSELACTFILE_WCP = 309, - SELACTFILE_WCP = 310, - LVBG_WCP = 311, - STARTUP_WCP = 312, - BUTTON_WCP = 313, - BUTTONS_WCP = 314, - POSITION_WCP = 315, - TITLE_WCP = 316, - COMMANDS_WCP = 317, - SHORTKEYS_WCP = 318, - PATHS_WCP = 319, - PATH_WCP = 320, - FILETYPES_WCP = 321, - FILETYPE_WCP = 322, - NORMAL_WCP = 323, - NOTYETCHECKED_WCP = 324, - UNKNOWN_WCP = 325, - NOSELECT_WCP = 326, - DIR_WCP = 327, - USEPATTERN_WCP = 328, - USECONTENT_WCP = 329, - PATTERN_WCP = 330, - CONTENT_WCP = 331, - FTCOMMANDS_WCP = 332, - DND_WCP = 333, - DC_WCP = 334, - SHOW_WCP = 335, - RAWSHOW_WCP = 336, - USER_WCP = 337, - FLAGS_WCP = 338, - IGNOREDIRS_WCP = 339, - HOTKEYS_WCP = 340, - HOTKEY_WCP = 341, - FONTS_WCP = 342, - GLOBALFONT_WCP = 343, - BUTTONFONT_WCP = 344, - LEFTFONT_WCP = 345, - RIGHTFONT_WCP = 346, - TEXTVIEWFONT_WCP = 347, - STATEBARFONT_WCP = 348, - CLOCKBARSETS_WCP = 349, - MODUS_WCP = 350, - TIMESPACE_WCP = 351, - VERSION_WCP = 352, - EXTERN_WCP = 353, - UPDATETIME_WCP = 354, - PROGRAM_WCP = 355, - SHOWHINTS_WCP = 356, - KEY_WCP = 357, - DOUBLE_WCP = 358, - MOD_WCP = 359, - CONTROL_WCP = 360, - SHIFT_WCP = 361, - LOCK_WCP = 362, - MOD1_WCP = 363, - MOD2_WCP = 364, - MOD3_WCP = 365, - MOD4_WCP = 366, - MOD5_WCP = 367, - DNDACTION_WCP = 368, - DCACTION_WCP = 369, - SHOWACTION_WCP = 370, - RSHOWACTION_WCP = 371, - USERACTION_WCP = 372, - ROWUP_WCP = 373, - ROWDOWN_WCP = 374, - CHANGEHIDDENFLAG_WCP = 375, - COPYOP_WCP = 376, - FIRSTROW_WCP = 377, - LASTROW_WCP = 378, - PAGEUP_WCP = 379, - PAGEDOWN_WCP = 380, - SELECTOP_WCP = 381, - SELECTALLOP_WCP = 382, - SELECTNONEOP_WCP = 383, - INVERTALLOP_WCP = 384, - PARENTDIROP_WCP = 385, - ENTERDIROP_WCP = 386, - CHANGELISTERSETOP_WCP = 387, - SWITCHLISTEROP_WCP = 388, - FILTERSELECTOP_WCP = 389, - FILTERUNSELECTOP_WCP = 390, - PATHTOOTHERSIDEOP_WCP = 391, - QUITOP_WCP = 392, - DELETEOP_WCP = 393, - RELOADOP_WCP = 394, - MAKEDIROP_WCP = 395, - RENAMEOP_WCP = 396, - DIRSIZEOP_WCP = 397, - SIMDDOP_WCP = 398, - STARTPROGOP_WCP = 399, - SEARCHENTRYOP_WCP = 400, - ENTERPATHOP_WCP = 401, - SCROLLLISTEROP_WCP = 402, - CREATESYMLINKOP_WCP = 403, - CHANGESYMLINKOP_WCP = 404, - CHMODOP_WCP = 405, - TOGGLELISTERMODEOP_WCP = 406, - SETSORTMODEOP_WCP = 407, - SETFILTEROP_WCP = 408, - SHORTKEYFROMLISTOP_WCP = 409, - CHOWNOP_WCP = 410, - WORKERCONFIG_WCP = 411, - USERSTYLE_WCP = 412, - DATESTRING_WCP = 413, - TIMESTRING_WCP = 414, - COLOR_WCP = 415, - PATTERNIGNORECASE_WCP = 416, - PATTERNUSEREGEXP_WCP = 417, - PATTERNUSEFULLNAME_WCP = 418, - COM_WCP = 419, - SEPARATEEACHENTRY_WCP = 420, - RECURSIVE_WCP = 421, - START_WCP = 422, - TERMINALWAIT_WCP = 423, - SHOWOUTPUT_WCP = 424, - VIEWSTR_WCP = 425, - SHOWOUTPUTINT_WCP = 426, - INBACKGROUND_WCP = 427, - TAKEDIRS_WCP = 428, - ACTIONNUMBER_WCP = 429, - HIDDENFILES_WCP = 430, - HIDE_WCP = 431, - TOGGLE_WCP = 432, - FOLLOWSYMLINKS_WCP = 433, - MOVE_WCP = 434, - RENAME_WCP = 435, - SAMEDIR_WCP = 436, - REQUESTDEST_WCP = 437, - REQUESTFLAGS_WCP = 438, - OVERWRITE_WCP = 439, - ALWAYS_WCP = 440, - NEVER_WCP = 441, - COPYMODE_WCP = 442, - FAST_WCP = 443, - PRESERVEATTR_WCP = 444, - MODE_WCP = 445, - ACTIVE_WCP = 446, - ACTIVE2OTHER_WCP = 447, - SPECIAL_WCP = 448, - REQUEST_WCP = 449, - CURRENT_WCP = 450, - OTHER_WCP = 451, - FILTER_WCP = 452, - QUICK_WCP = 453, - ALSOACTIVE_WCP = 454, - RESETDIRSIZES_WCP = 455, - KEEPFILETYPES_WCP = 456, - RELATIVE_WCP = 457, - ONFILES_WCP = 458, - ONDIRS_WCP = 459, - SORTBY_WCP = 460, - SORTFLAG_WCP = 461, - REVERSE_WCP = 462, - DIRLAST_WCP = 463, - DIRMIXED_WCP = 464, - EXCLUDE_WCP = 465, - INCLUDE_WCP = 466, - UNSET_WCP = 467, - UNSETALL_WCP = 468, - SCRIPTOP_WCP = 469, - NOP_WCP = 470, - PUSH_WCP = 471, - LABEL_WCP = 472, - IF_WCP = 473, - END_WCP = 474, - POP_WCP = 475, - SETTINGS_WCP = 476, - WINDOW_WCP = 477, - GOTO_WCP = 478, - PUSHUSEOUTPUT_WCP = 479, - DODEBUG_WCP = 480, - WPURECURSIVE_WCP = 481, - WPUTAKEDIRS_WCP = 482, - STACKNR_WCP = 483, - PUSHSTRING_WCP = 484, - IFTEST_WCP = 485, - IFLABEL_WCP = 486, - WINTYPE_WCP = 487, - OPEN_WCP = 488, - CLOSE_WCP = 489, - LEAVE_WCP = 490, - CHANGEPROGRESS_WCP = 491, - CHANGETEXT_WCP = 492, - PROGRESSUSEOUTPUT_WCP = 493, - WINTEXTUSEOUTPUT_WCP = 494, - PROGRESS_WCP = 495, - WINTEXT_WCP = 496, - SHOWDIRCACHEOP_WCP = 497, - INODE_WCP = 498, - NLINK_WCP = 499, - BLOCKS_WCP = 500, - SHOWHEADER_WCP = 501, - LVHEADER_WCP = 502, - IGNORECASE_WCP = 503, - LISTVIEWS_WCP = 504, - BLL_WCP = 505, - LBL_WCP = 506, - LLB_WCP = 507, - BL_WCP = 508, - LB_WCP = 509, - LAYOUT_WCP = 510, - BUTTONSVERT_WCP = 511, - LISTVIEWSVERT_WCP = 512, - LISTVIEWWEIGHT_WCP = 513, - WEIGHTTOACTIVE_WCP = 514, - EXTCOND_WCP = 515, - USEEXTCOND_WCP = 516, - SUBTYPE_WCP = 517, - PARENTACTIONOP_WCP = 518, - NOOPERATIONOP_WCP = 519, - COLORMODE_WCP = 520, - DEFAULT_WCP = 521, - CUSTOM_WCP = 522, - UNSELECTCOLOR_WCP = 523, - SELECTCOLOR_WCP = 524, - UNSELECTACTIVECOLOR_WCP = 525, - SELECTACTIVECOLOR_WCP = 526, - COLOREXTERNPROG_WCP = 527, - PARENT_WCP = 528, - DONTCD_WCP = 529, - DONTCHECKVIRTUAL_WCP = 530, - GOFTPOP_WCP = 531, - HOSTNAME_WCP = 532, - USERNAME_WCP = 533, - PASSWORD_WCP = 534, - DONTENTERFTP_WCP = 535, - ALWAYSSTOREPW_WCP = 536, - INTERNALVIEWOP_WCP = 537, - CUSTOMFILES_WCP = 538, - SHOWMODE_WCP = 539, - SELECTED_WCP = 540, - REVERSESEARCH_WCP = 541, - MOUSECONF_WCP = 542, - SELECTBUTTON_WCP = 543, - ACTIVATEBUTTON_WCP = 544, - SCROLLBUTTON_WCP = 545, - SELECTMETHOD_WCP = 546, - ALTERNATIVE_WCP = 547, - SEARCHOP_WCP = 548, - EDITCOMMAND_WCP = 549, - SHOWPREVRESULTS_WCP = 550, - TEXTVIEW_WCP = 551, - TEXTVIEWHIGHLIGHTED_WCP = 552, - TEXTVIEWSELECTION_WCP = 553, - DIRBOOKMARKOP_WCP = 554, - OPENCONTEXTMENUOP_WCP = 555, - RUNCUSTOMACTION_WCP = 556, - CUSTOMNAME_WCP = 557, - CONTEXTBUTTON_WCP = 558, - ACTIVATEMOD_WCP = 559, - SCROLLMOD_WCP = 560, - CONTEXTMOD_WCP = 561, - NONE_WCP = 562, - CUSTOMACTION_WCP = 563, - SAVE_WORKER_STATE_ON_EXIT_WCP = 564, - OPENWORKERMENUOP_WCP = 565, - CHANGELABELOP_WCP = 566, - ASKFORLABEL_WCP = 567, - LABELCOLORS_WCP = 568, - BOOKMARKLABEL_WCP = 569, - BOOKMARKFILTER_WCP = 570, - SHOWONLYBOOKMARKS_WCP = 571, - SHOWONLYLABEL_WCP = 572, - SHOWALL_WCP = 573, - OPTIONMODE_WCP = 574, - INVERT_WCP = 575, - SET_WCP = 576, - CHANGEFILTERS_WCP = 577, - CHANGEBOOKMARKS_WCP = 578, - QUERYLABEL_WCP = 579, - MODIFYTABSOP_WCP = 580, - TABACTION_WCP = 581, - NEWTAB_WCP = 582, - CLOSECURRENTTAB_WCP = 583, - NEXTTAB_WCP = 584, - PREVTAB_WCP = 585, - CHANGELAYOUTOP_WCP = 586, - INFIXSEARCH_WCP = 587, - VOLUMEMANAGEROP_WCP = 588, - ERROR = 589, - ACTIVESIDE_WCP = 590, - SHOWFREESPACE_WCP = 591, - ACTIVEMODE_WCP = 592, - ASK_WCP = 593, - SSHALLOW_WCP = 594, - FIELD_WIDTH_WCP = 595, - QUICKSEARCHENABLED_WCP = 596, - FILTEREDSEARCHENABLED_WCP = 597, - XFTFONTS_WCP = 598, - USEMAGIC_WCP = 599, - MAGICPATTERN_WCP = 600, - MAGICCOMPRESSED_WCP = 601, - MAGICMIME_WCP = 602, - VOLUMEMANAGER_WCP = 603, - MOUNTCOMMAND_WCP = 604, - UNMOUNTCOMMAND_WCP = 605, - FSTABFILE_WCP = 606, - MTABFILE_WCP = 607, - PARTFILE_WCP = 608, - REQUESTACTION_WCP = 609, - SIZEH_WCP = 610, - NEXTAGING_WCP = 611, - ENTRY_WCP = 612, - PREFIX_WCP = 613, - VALUE_WCP = 614, - EJECTCOMMAND_WCP = 615, - CLOSETRAYCOMMAND_WCP = 616, - AVFSMODULE_WCP = 617, - FLEXIBLEMATCH_WCP = 618, - USE_VERSION_STRING_COMPARE_WCP = 619, - SWITCHBUTTONBANKOP_WCP = 620, - SWITCHTONEXTBANK_WCP = 621, - SWITCHTOPREVBANK_WCP = 622, - SWITCHTOBANKNR_WCP = 623, - BANKNR_WCP = 624, - USE_VIRTUAL_TEMP_COPIES_WCP = 625, - PATHJUMPOP_WCP = 626, - PATHJUMPALLOWDIRS_WCP = 627, - CLIPBOARDOP_WCP = 628, - CLIPBOARDSTRING_WCP = 629, - COMMANDSTRING_WCP = 630, - EVALCOMMAND_WCP = 631, - WATCHMODE_WCP = 632, - APPLY_WINDOW_DIALOG_TYPE_WCP = 633, - FLAGS_ARE_RELATIVE_TO_BASEDIR_WCP = 634, - COMMANDMENUOP_WCP = 635, - SEARCHMODEONKEYPRESS_WCP = 636, - PATHENTRYONTOP_WCP = 637, - STORE_FILES_ALWAYS_WCP = 638, - PATHJUMPSETS_WCP = 639, - SHOWDOTDOT_WCP = 640, - SHOWBREADCRUMB_WCP = 641, - FACES_WCP = 642, - FACE_WCP = 643, - ENABLE_INFO_LINE_WCP = 644, - INFO_LINE_LUA_MODE_WCP = 645, - INFO_LINE_CONTENT_WCP = 646, - RESTORE_TABS_MODE_WCP = 647, - STORE_TABS_MODE_WCP = 648, - AS_EXIT_STATE_WCP = 649, - USE_EXTENDED_REGEX_WCP = 650, - HIGHLIGHT_USER_ACTION_WCP = 651, - CHTIMEOP_WCP = 652, - ADJUSTRELATIVESYMLINKS_WCP = 653, - OUTSIDE_WCP = 654, - EDIT_WCP = 655, - MAKEABSOLUTE_WCP = 656, - MAKERELATIVE_WCP = 657, - MAGICIGNORECASE_WCP = 658, - ENSURE_FILE_PERMISSIONS_WCP = 659, - USER_RW_WCP = 660, - USER_RW_GROUP_R_WCP = 661, - USER_RW_ALL_R_WCP = 662, - LEAVE_UNMODIFIED_WCP = 663, - PREFERUDISKSVERSION_WCP = 664, - CHANGECOLUMNSOP_WCP = 665, - PATTERNISCOMMASEPARATED_WCP = 666, - STRCASECMP_WCP = 667, - USE_STRING_COMPARE_MODE_WCP = 668, - VIEWNEWESTFILESOP_WCP = 669, - SHOWRECENT_WCP = 670, - DIRCOMPAREOP_WCP = 671, - TABPROFILESOP_WCP = 672, - EXTERNALVDIROP_WCP = 673, - STRING_WCP = 674, - NUM_WCP = 675 - }; + enum yytokentype + { + LEFTBRACE_WCP = 258, + RIGHTBRACE_WCP = 259, + GLOBAL_WCP = 260, + COLORS_WCP = 261, + LANG_WCP = 262, + PALETTE_WCP = 263, + OWNOP_WCP = 264, + LISTERSETS_WCP = 265, + YES_WCP = 266, + NO_WCP = 267, + LEFT_WCP = 268, + RIGHT_WCP = 269, + HBARTOP_WCP = 270, + HBARHEIGHT_WCP = 271, + VBARLEFT_WCP = 272, + VBARWIDTH_WCP = 273, + DISPLAYSETS_WCP = 274, + NAME_WCP = 275, + SIZE_WCP = 276, + TYPE_WCP = 277, + PERMISSION_WCP = 278, + OWNER_WCP = 279, + DESTINATION_WCP = 280, + MODTIME_WCP = 281, + ACCTIME_WCP = 282, + CHGTIME_WCP = 283, + ROWS_WCP = 284, + COLUMNS_WCP = 285, + CACHESIZE_WCP = 286, + OWNERSTYLE_WCP = 287, + TERMINAL_WCP = 288, + USESTRINGFORDIRSIZE_WCP = 289, + TIMESETS_WCP = 290, + STYLE1_WCP = 291, + STYLE2_WCP = 292, + STYLE3_WCP = 293, + DATE_WCP = 294, + TIME_WCP = 295, + DATESUBSTITUTION_WCP = 296, + DATEBEFORETIME_WCP = 297, + STATEBAR_WCP = 298, + SELLVBAR_WCP = 299, + UNSELLVBAR_WCP = 300, + CLOCKBAR_WCP = 301, + REQUESTER_WCP = 302, + UNSELDIR_WCP = 303, + SELDIR_WCP = 304, + UNSELFILE_WCP = 305, + SELFILE_WCP = 306, + UNSELACTDIR_WCP = 307, + SELACTDIR_WCP = 308, + UNSELACTFILE_WCP = 309, + SELACTFILE_WCP = 310, + LVBG_WCP = 311, + STARTUP_WCP = 312, + BUTTON_WCP = 313, + BUTTONS_WCP = 314, + POSITION_WCP = 315, + TITLE_WCP = 316, + COMMANDS_WCP = 317, + SHORTKEYS_WCP = 318, + PATHS_WCP = 319, + PATH_WCP = 320, + FILETYPES_WCP = 321, + FILETYPE_WCP = 322, + NORMAL_WCP = 323, + NOTYETCHECKED_WCP = 324, + UNKNOWN_WCP = 325, + NOSELECT_WCP = 326, + DIR_WCP = 327, + USEPATTERN_WCP = 328, + USECONTENT_WCP = 329, + PATTERN_WCP = 330, + CONTENT_WCP = 331, + FTCOMMANDS_WCP = 332, + DND_WCP = 333, + DC_WCP = 334, + SHOW_WCP = 335, + RAWSHOW_WCP = 336, + USER_WCP = 337, + FLAGS_WCP = 338, + IGNOREDIRS_WCP = 339, + HOTKEYS_WCP = 340, + HOTKEY_WCP = 341, + FONTS_WCP = 342, + GLOBALFONT_WCP = 343, + BUTTONFONT_WCP = 344, + LEFTFONT_WCP = 345, + RIGHTFONT_WCP = 346, + TEXTVIEWFONT_WCP = 347, + STATEBARFONT_WCP = 348, + CLOCKBARSETS_WCP = 349, + MODUS_WCP = 350, + TIMESPACE_WCP = 351, + VERSION_WCP = 352, + EXTERN_WCP = 353, + UPDATETIME_WCP = 354, + PROGRAM_WCP = 355, + SHOWHINTS_WCP = 356, + KEY_WCP = 357, + DOUBLE_WCP = 358, + MOD_WCP = 359, + CONTROL_WCP = 360, + SHIFT_WCP = 361, + LOCK_WCP = 362, + MOD1_WCP = 363, + MOD2_WCP = 364, + MOD3_WCP = 365, + MOD4_WCP = 366, + MOD5_WCP = 367, + DNDACTION_WCP = 368, + DCACTION_WCP = 369, + SHOWACTION_WCP = 370, + RSHOWACTION_WCP = 371, + USERACTION_WCP = 372, + ROWUP_WCP = 373, + ROWDOWN_WCP = 374, + CHANGEHIDDENFLAG_WCP = 375, + COPYOP_WCP = 376, + FIRSTROW_WCP = 377, + LASTROW_WCP = 378, + PAGEUP_WCP = 379, + PAGEDOWN_WCP = 380, + SELECTOP_WCP = 381, + SELECTALLOP_WCP = 382, + SELECTNONEOP_WCP = 383, + INVERTALLOP_WCP = 384, + PARENTDIROP_WCP = 385, + ENTERDIROP_WCP = 386, + CHANGELISTERSETOP_WCP = 387, + SWITCHLISTEROP_WCP = 388, + FILTERSELECTOP_WCP = 389, + FILTERUNSELECTOP_WCP = 390, + PATHTOOTHERSIDEOP_WCP = 391, + QUITOP_WCP = 392, + DELETEOP_WCP = 393, + RELOADOP_WCP = 394, + MAKEDIROP_WCP = 395, + RENAMEOP_WCP = 396, + DIRSIZEOP_WCP = 397, + SIMDDOP_WCP = 398, + STARTPROGOP_WCP = 399, + SEARCHENTRYOP_WCP = 400, + ENTERPATHOP_WCP = 401, + SCROLLLISTEROP_WCP = 402, + CREATESYMLINKOP_WCP = 403, + CHANGESYMLINKOP_WCP = 404, + CHMODOP_WCP = 405, + TOGGLELISTERMODEOP_WCP = 406, + SETSORTMODEOP_WCP = 407, + SETFILTEROP_WCP = 408, + SHORTKEYFROMLISTOP_WCP = 409, + CHOWNOP_WCP = 410, + WORKERCONFIG_WCP = 411, + USERSTYLE_WCP = 412, + DATESTRING_WCP = 413, + TIMESTRING_WCP = 414, + COLOR_WCP = 415, + PATTERNIGNORECASE_WCP = 416, + PATTERNUSEREGEXP_WCP = 417, + PATTERNUSEFULLNAME_WCP = 418, + COM_WCP = 419, + SEPARATEEACHENTRY_WCP = 420, + RECURSIVE_WCP = 421, + START_WCP = 422, + TERMINALWAIT_WCP = 423, + SHOWOUTPUT_WCP = 424, + VIEWSTR_WCP = 425, + SHOWOUTPUTINT_WCP = 426, + INBACKGROUND_WCP = 427, + TAKEDIRS_WCP = 428, + ACTIONNUMBER_WCP = 429, + HIDDENFILES_WCP = 430, + HIDE_WCP = 431, + TOGGLE_WCP = 432, + FOLLOWSYMLINKS_WCP = 433, + MOVE_WCP = 434, + RENAME_WCP = 435, + SAMEDIR_WCP = 436, + REQUESTDEST_WCP = 437, + REQUESTFLAGS_WCP = 438, + OVERWRITE_WCP = 439, + ALWAYS_WCP = 440, + NEVER_WCP = 441, + COPYMODE_WCP = 442, + FAST_WCP = 443, + PRESERVEATTR_WCP = 444, + MODE_WCP = 445, + ACTIVE_WCP = 446, + ACTIVE2OTHER_WCP = 447, + SPECIAL_WCP = 448, + REQUEST_WCP = 449, + CURRENT_WCP = 450, + OTHER_WCP = 451, + FILTER_WCP = 452, + QUICK_WCP = 453, + ALSOACTIVE_WCP = 454, + RESETDIRSIZES_WCP = 455, + KEEPFILETYPES_WCP = 456, + RELATIVE_WCP = 457, + ONFILES_WCP = 458, + ONDIRS_WCP = 459, + SORTBY_WCP = 460, + SORTFLAG_WCP = 461, + REVERSE_WCP = 462, + DIRLAST_WCP = 463, + DIRMIXED_WCP = 464, + EXCLUDE_WCP = 465, + INCLUDE_WCP = 466, + UNSET_WCP = 467, + UNSETALL_WCP = 468, + SCRIPTOP_WCP = 469, + NOP_WCP = 470, + PUSH_WCP = 471, + LABEL_WCP = 472, + IF_WCP = 473, + END_WCP = 474, + POP_WCP = 475, + SETTINGS_WCP = 476, + WINDOW_WCP = 477, + GOTO_WCP = 478, + PUSHUSEOUTPUT_WCP = 479, + DODEBUG_WCP = 480, + WPURECURSIVE_WCP = 481, + WPUTAKEDIRS_WCP = 482, + STACKNR_WCP = 483, + PUSHSTRING_WCP = 484, + IFTEST_WCP = 485, + IFLABEL_WCP = 486, + WINTYPE_WCP = 487, + OPEN_WCP = 488, + CLOSE_WCP = 489, + LEAVE_WCP = 490, + CHANGEPROGRESS_WCP = 491, + CHANGETEXT_WCP = 492, + PROGRESSUSEOUTPUT_WCP = 493, + WINTEXTUSEOUTPUT_WCP = 494, + PROGRESS_WCP = 495, + WINTEXT_WCP = 496, + SHOWDIRCACHEOP_WCP = 497, + INODE_WCP = 498, + NLINK_WCP = 499, + BLOCKS_WCP = 500, + SHOWHEADER_WCP = 501, + LVHEADER_WCP = 502, + IGNORECASE_WCP = 503, + LISTVIEWS_WCP = 504, + BLL_WCP = 505, + LBL_WCP = 506, + LLB_WCP = 507, + BL_WCP = 508, + LB_WCP = 509, + LAYOUT_WCP = 510, + BUTTONSVERT_WCP = 511, + LISTVIEWSVERT_WCP = 512, + LISTVIEWWEIGHT_WCP = 513, + WEIGHTTOACTIVE_WCP = 514, + EXTCOND_WCP = 515, + USEEXTCOND_WCP = 516, + SUBTYPE_WCP = 517, + PARENTACTIONOP_WCP = 518, + NOOPERATIONOP_WCP = 519, + COLORMODE_WCP = 520, + DEFAULT_WCP = 521, + CUSTOM_WCP = 522, + UNSELECTCOLOR_WCP = 523, + SELECTCOLOR_WCP = 524, + UNSELECTACTIVECOLOR_WCP = 525, + SELECTACTIVECOLOR_WCP = 526, + COLOREXTERNPROG_WCP = 527, + PARENT_WCP = 528, + DONTCD_WCP = 529, + DONTCHECKVIRTUAL_WCP = 530, + GOFTPOP_WCP = 531, + HOSTNAME_WCP = 532, + USERNAME_WCP = 533, + PASSWORD_WCP = 534, + DONTENTERFTP_WCP = 535, + ALWAYSSTOREPW_WCP = 536, + INTERNALVIEWOP_WCP = 537, + CUSTOMFILES_WCP = 538, + SHOWMODE_WCP = 539, + SELECTED_WCP = 540, + REVERSESEARCH_WCP = 541, + MOUSECONF_WCP = 542, + SELECTBUTTON_WCP = 543, + ACTIVATEBUTTON_WCP = 544, + SCROLLBUTTON_WCP = 545, + SELECTMETHOD_WCP = 546, + ALTERNATIVE_WCP = 547, + SEARCHOP_WCP = 548, + EDITCOMMAND_WCP = 549, + SHOWPREVRESULTS_WCP = 550, + TEXTVIEW_WCP = 551, + TEXTVIEWHIGHLIGHTED_WCP = 552, + TEXTVIEWSELECTION_WCP = 553, + DIRBOOKMARKOP_WCP = 554, + OPENCONTEXTMENUOP_WCP = 555, + RUNCUSTOMACTION_WCP = 556, + CUSTOMNAME_WCP = 557, + CONTEXTBUTTON_WCP = 558, + ACTIVATEMOD_WCP = 559, + SCROLLMOD_WCP = 560, + CONTEXTMOD_WCP = 561, + NONE_WCP = 562, + CUSTOMACTION_WCP = 563, + SAVE_WORKER_STATE_ON_EXIT_WCP = 564, + OPENWORKERMENUOP_WCP = 565, + CHANGELABELOP_WCP = 566, + ASKFORLABEL_WCP = 567, + LABELCOLORS_WCP = 568, + BOOKMARKLABEL_WCP = 569, + BOOKMARKFILTER_WCP = 570, + SHOWONLYBOOKMARKS_WCP = 571, + SHOWONLYLABEL_WCP = 572, + SHOWALL_WCP = 573, + OPTIONMODE_WCP = 574, + INVERT_WCP = 575, + SET_WCP = 576, + CHANGEFILTERS_WCP = 577, + CHANGEBOOKMARKS_WCP = 578, + QUERYLABEL_WCP = 579, + MODIFYTABSOP_WCP = 580, + TABACTION_WCP = 581, + NEWTAB_WCP = 582, + CLOSECURRENTTAB_WCP = 583, + NEXTTAB_WCP = 584, + PREVTAB_WCP = 585, + TOGGLELOCKSTATE_WCP = 586, + MOVETABLEFT_WCP = 587, + MOVETABRIGHT_WCP = 588, + CHANGELAYOUTOP_WCP = 589, + INFIXSEARCH_WCP = 590, + VOLUMEMANAGEROP_WCP = 591, + ERROR = 592, + ACTIVESIDE_WCP = 593, + SHOWFREESPACE_WCP = 594, + ACTIVEMODE_WCP = 595, + ASK_WCP = 596, + SSHALLOW_WCP = 597, + FIELD_WIDTH_WCP = 598, + QUICKSEARCHENABLED_WCP = 599, + FILTEREDSEARCHENABLED_WCP = 600, + XFTFONTS_WCP = 601, + USEMAGIC_WCP = 602, + MAGICPATTERN_WCP = 603, + MAGICCOMPRESSED_WCP = 604, + MAGICMIME_WCP = 605, + VOLUMEMANAGER_WCP = 606, + MOUNTCOMMAND_WCP = 607, + UNMOUNTCOMMAND_WCP = 608, + FSTABFILE_WCP = 609, + MTABFILE_WCP = 610, + PARTFILE_WCP = 611, + REQUESTACTION_WCP = 612, + SIZEH_WCP = 613, + NEXTAGING_WCP = 614, + ENTRY_WCP = 615, + PREFIX_WCP = 616, + VALUE_WCP = 617, + EJECTCOMMAND_WCP = 618, + CLOSETRAYCOMMAND_WCP = 619, + AVFSMODULE_WCP = 620, + FLEXIBLEMATCH_WCP = 621, + USE_VERSION_STRING_COMPARE_WCP = 622, + SWITCHBUTTONBANKOP_WCP = 623, + SWITCHTONEXTBANK_WCP = 624, + SWITCHTOPREVBANK_WCP = 625, + SWITCHTOBANKNR_WCP = 626, + BANKNR_WCP = 627, + USE_VIRTUAL_TEMP_COPIES_WCP = 628, + PATHJUMPOP_WCP = 629, + PATHJUMPALLOWDIRS_WCP = 630, + CLIPBOARDOP_WCP = 631, + CLIPBOARDSTRING_WCP = 632, + COMMANDSTRING_WCP = 633, + EVALCOMMAND_WCP = 634, + WATCHMODE_WCP = 635, + APPLY_WINDOW_DIALOG_TYPE_WCP = 636, + FLAGS_ARE_RELATIVE_TO_BASEDIR_WCP = 637, + COMMANDMENUOP_WCP = 638, + SEARCHMODEONKEYPRESS_WCP = 639, + PATHENTRYONTOP_WCP = 640, + STORE_FILES_ALWAYS_WCP = 641, + PATHJUMPSETS_WCP = 642, + SHOWDOTDOT_WCP = 643, + SHOWBREADCRUMB_WCP = 644, + FACES_WCP = 645, + FACE_WCP = 646, + ENABLE_INFO_LINE_WCP = 647, + INFO_LINE_LUA_MODE_WCP = 648, + INFO_LINE_CONTENT_WCP = 649, + RESTORE_TABS_MODE_WCP = 650, + STORE_TABS_MODE_WCP = 651, + AS_EXIT_STATE_WCP = 652, + USE_EXTENDED_REGEX_WCP = 653, + HIGHLIGHT_USER_ACTION_WCP = 654, + CHTIMEOP_WCP = 655, + ADJUSTRELATIVESYMLINKS_WCP = 656, + OUTSIDE_WCP = 657, + EDIT_WCP = 658, + MAKEABSOLUTE_WCP = 659, + MAKERELATIVE_WCP = 660, + MAGICIGNORECASE_WCP = 661, + ENSURE_FILE_PERMISSIONS_WCP = 662, + USER_RW_WCP = 663, + USER_RW_GROUP_R_WCP = 664, + USER_RW_ALL_R_WCP = 665, + LEAVE_UNMODIFIED_WCP = 666, + PREFERUDISKSVERSION_WCP = 667, + CHANGECOLUMNSOP_WCP = 668, + PATTERNISCOMMASEPARATED_WCP = 669, + STRCASECMP_WCP = 670, + USE_STRING_COMPARE_MODE_WCP = 671, + VIEWNEWESTFILESOP_WCP = 672, + SHOWRECENT_WCP = 673, + DIRCOMPAREOP_WCP = 674, + TABPROFILESOP_WCP = 675, + EXTERNALVDIROP_WCP = 676, + VDIR_PRESERVE_DIR_STRUCTURE_WCP = 677, + OPENTABMENUOP_WCP = 678, + STRING_WCP = 679, + NUM_WCP = 680 + }; #endif /* Tokens. */ #define LEFTBRACE_WCP 258 @@ -795,131 +799,123 @@ #define CLOSECURRENTTAB_WCP 583 #define NEXTTAB_WCP 584 #define PREVTAB_WCP 585 -#define CHANGELAYOUTOP_WCP 586 -#define INFIXSEARCH_WCP 587 -#define VOLUMEMANAGEROP_WCP 588 -#define ERROR 589 -#define ACTIVESIDE_WCP 590 -#define SHOWFREESPACE_WCP 591 -#define ACTIVEMODE_WCP 592 -#define ASK_WCP 593 -#define SSHALLOW_WCP 594 -#define FIELD_WIDTH_WCP 595 -#define QUICKSEARCHENABLED_WCP 596 -#define FILTEREDSEARCHENABLED_WCP 597 -#define XFTFONTS_WCP 598 -#define USEMAGIC_WCP 599 -#define MAGICPATTERN_WCP 600 -#define MAGICCOMPRESSED_WCP 601 -#define MAGICMIME_WCP 602 -#define VOLUMEMANAGER_WCP 603 -#define MOUNTCOMMAND_WCP 604 -#define UNMOUNTCOMMAND_WCP 605 -#define FSTABFILE_WCP 606 -#define MTABFILE_WCP 607 -#define PARTFILE_WCP 608 -#define REQUESTACTION_WCP 609 -#define SIZEH_WCP 610 -#define NEXTAGING_WCP 611 -#define ENTRY_WCP 612 -#define PREFIX_WCP 613 -#define VALUE_WCP 614 -#define EJECTCOMMAND_WCP 615 -#define CLOSETRAYCOMMAND_WCP 616 -#define AVFSMODULE_WCP 617 -#define FLEXIBLEMATCH_WCP 618 -#define USE_VERSION_STRING_COMPARE_WCP 619 -#define SWITCHBUTTONBANKOP_WCP 620 -#define SWITCHTONEXTBANK_WCP 621 -#define SWITCHTOPREVBANK_WCP 622 -#define SWITCHTOBANKNR_WCP 623 -#define BANKNR_WCP 624 -#define USE_VIRTUAL_TEMP_COPIES_WCP 625 -#define PATHJUMPOP_WCP 626 -#define PATHJUMPALLOWDIRS_WCP 627 -#define CLIPBOARDOP_WCP 628 -#define CLIPBOARDSTRING_WCP 629 -#define COMMANDSTRING_WCP 630 -#define EVALCOMMAND_WCP 631 -#define WATCHMODE_WCP 632 -#define APPLY_WINDOW_DIALOG_TYPE_WCP 633 -#define FLAGS_ARE_RELATIVE_TO_BASEDIR_WCP 634 -#define COMMANDMENUOP_WCP 635 -#define SEARCHMODEONKEYPRESS_WCP 636 -#define PATHENTRYONTOP_WCP 637 -#define STORE_FILES_ALWAYS_WCP 638 -#define PATHJUMPSETS_WCP 639 -#define SHOWDOTDOT_WCP 640 -#define SHOWBREADCRUMB_WCP 641 -#define FACES_WCP 642 -#define FACE_WCP 643 -#define ENABLE_INFO_LINE_WCP 644 -#define INFO_LINE_LUA_MODE_WCP 645 -#define INFO_LINE_CONTENT_WCP 646 -#define RESTORE_TABS_MODE_WCP 647 -#define STORE_TABS_MODE_WCP 648 -#define AS_EXIT_STATE_WCP 649 -#define USE_EXTENDED_REGEX_WCP 650 -#define HIGHLIGHT_USER_ACTION_WCP 651 -#define CHTIMEOP_WCP 652 -#define ADJUSTRELATIVESYMLINKS_WCP 653 -#define OUTSIDE_WCP 654 -#define EDIT_WCP 655 -#define MAKEABSOLUTE_WCP 656 -#define MAKERELATIVE_WCP 657 -#define MAGICIGNORECASE_WCP 658 -#define ENSURE_FILE_PERMISSIONS_WCP 659 -#define USER_RW_WCP 660 -#define USER_RW_GROUP_R_WCP 661 -#define USER_RW_ALL_R_WCP 662 -#define LEAVE_UNMODIFIED_WCP 663 -#define PREFERUDISKSVERSION_WCP 664 -#define CHANGECOLUMNSOP_WCP 665 -#define PATTERNISCOMMASEPARATED_WCP 666 -#define STRCASECMP_WCP 667 -#define USE_STRING_COMPARE_MODE_WCP 668 -#define VIEWNEWESTFILESOP_WCP 669 -#define SHOWRECENT_WCP 670 -#define DIRCOMPAREOP_WCP 671 -#define TABPROFILESOP_WCP 672 -#define EXTERNALVDIROP_WCP 673 -#define STRING_WCP 674 -#define NUM_WCP 675 - - +#define TOGGLELOCKSTATE_WCP 586 +#define MOVETABLEFT_WCP 587 +#define MOVETABRIGHT_WCP 588 +#define CHANGELAYOUTOP_WCP 589 +#define INFIXSEARCH_WCP 590 +#define VOLUMEMANAGEROP_WCP 591 +#define ERROR 592 +#define ACTIVESIDE_WCP 593 +#define SHOWFREESPACE_WCP 594 +#define ACTIVEMODE_WCP 595 +#define ASK_WCP 596 +#define SSHALLOW_WCP 597 +#define FIELD_WIDTH_WCP 598 +#define QUICKSEARCHENABLED_WCP 599 +#define FILTEREDSEARCHENABLED_WCP 600 +#define XFTFONTS_WCP 601 +#define USEMAGIC_WCP 602 +#define MAGICPATTERN_WCP 603 +#define MAGICCOMPRESSED_WCP 604 +#define MAGICMIME_WCP 605 +#define VOLUMEMANAGER_WCP 606 +#define MOUNTCOMMAND_WCP 607 +#define UNMOUNTCOMMAND_WCP 608 +#define FSTABFILE_WCP 609 +#define MTABFILE_WCP 610 +#define PARTFILE_WCP 611 +#define REQUESTACTION_WCP 612 +#define SIZEH_WCP 613 +#define NEXTAGING_WCP 614 +#define ENTRY_WCP 615 +#define PREFIX_WCP 616 +#define VALUE_WCP 617 +#define EJECTCOMMAND_WCP 618 +#define CLOSETRAYCOMMAND_WCP 619 +#define AVFSMODULE_WCP 620 +#define FLEXIBLEMATCH_WCP 621 +#define USE_VERSION_STRING_COMPARE_WCP 622 +#define SWITCHBUTTONBANKOP_WCP 623 +#define SWITCHTONEXTBANK_WCP 624 +#define SWITCHTOPREVBANK_WCP 625 +#define SWITCHTOBANKNR_WCP 626 +#define BANKNR_WCP 627 +#define USE_VIRTUAL_TEMP_COPIES_WCP 628 +#define PATHJUMPOP_WCP 629 +#define PATHJUMPALLOWDIRS_WCP 630 +#define CLIPBOARDOP_WCP 631 +#define CLIPBOARDSTRING_WCP 632 +#define COMMANDSTRING_WCP 633 +#define EVALCOMMAND_WCP 634 +#define WATCHMODE_WCP 635 +#define APPLY_WINDOW_DIALOG_TYPE_WCP 636 +#define FLAGS_ARE_RELATIVE_TO_BASEDIR_WCP 637 +#define COMMANDMENUOP_WCP 638 +#define SEARCHMODEONKEYPRESS_WCP 639 +#define PATHENTRYONTOP_WCP 640 +#define STORE_FILES_ALWAYS_WCP 641 +#define PATHJUMPSETS_WCP 642 +#define SHOWDOTDOT_WCP 643 +#define SHOWBREADCRUMB_WCP 644 +#define FACES_WCP 645 +#define FACE_WCP 646 +#define ENABLE_INFO_LINE_WCP 647 +#define INFO_LINE_LUA_MODE_WCP 648 +#define INFO_LINE_CONTENT_WCP 649 +#define RESTORE_TABS_MODE_WCP 650 +#define STORE_TABS_MODE_WCP 651 +#define AS_EXIT_STATE_WCP 652 +#define USE_EXTENDED_REGEX_WCP 653 +#define HIGHLIGHT_USER_ACTION_WCP 654 +#define CHTIMEOP_WCP 655 +#define ADJUSTRELATIVESYMLINKS_WCP 656 +#define OUTSIDE_WCP 657 +#define EDIT_WCP 658 +#define MAKEABSOLUTE_WCP 659 +#define MAKERELATIVE_WCP 660 +#define MAGICIGNORECASE_WCP 661 +#define ENSURE_FILE_PERMISSIONS_WCP 662 +#define USER_RW_WCP 663 +#define USER_RW_GROUP_R_WCP 664 +#define USER_RW_ALL_R_WCP 665 +#define LEAVE_UNMODIFIED_WCP 666 +#define PREFERUDISKSVERSION_WCP 667 +#define CHANGECOLUMNSOP_WCP 668 +#define PATTERNISCOMMASEPARATED_WCP 669 +#define STRCASECMP_WCP 670 +#define USE_STRING_COMPARE_MODE_WCP 671 +#define VIEWNEWESTFILESOP_WCP 672 +#define SHOWRECENT_WCP 673 +#define DIRCOMPAREOP_WCP 674 +#define TABPROFILESOP_WCP 675 +#define EXTERNALVDIROP_WCP 676 +#define VDIR_PRESERVE_DIR_STRUCTURE_WCP 677 +#define OPENTABMENUOP_WCP 678 +#define STRING_WCP 679 +#define NUM_WCP 680 +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE + +union YYSTYPE { -/* Line 2058 of yacc.c */ -#line 221 "configparser.yy" +#line 221 "configparser.yy" /* yacc.c:1909 */ int num; char *strptr; +#line 909 "configparser.hh" /* yacc.c:1909 */ +}; -/* Line 2058 of yacc.c */ -#line 903 "configparser.hh" -} YYSTYPE; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_CONFIGPARSER_HH_INCLUDED */ diff -Nru worker-3.14.0/src/configparser.yy worker-3.15.4/src/configparser.yy --- worker-3.14.0/src/configparser.yy 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/configparser.yy 2019-01-28 21:40:22.000000000 +0000 @@ -1,7 +1,7 @@ %{ /* parser for config file (bison generated) * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2003-2017 Ralf Hoffmann. + * Copyright (C) 2003-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -272,7 +272,7 @@ %token CHANGELABELOP_WCP ASKFORLABEL_WCP LABELCOLORS_WCP %token BOOKMARKLABEL_WCP BOOKMARKFILTER_WCP SHOWONLYBOOKMARKS_WCP SHOWONLYLABEL_WCP SHOWALL_WCP %token OPTIONMODE_WCP INVERT_WCP SET_WCP CHANGEFILTERS_WCP CHANGEBOOKMARKS_WCP QUERYLABEL_WCP -%token MODIFYTABSOP_WCP TABACTION_WCP NEWTAB_WCP CLOSECURRENTTAB_WCP NEXTTAB_WCP PREVTAB_WCP +%token MODIFYTABSOP_WCP TABACTION_WCP NEWTAB_WCP CLOSECURRENTTAB_WCP NEXTTAB_WCP PREVTAB_WCP TOGGLELOCKSTATE_WCP MOVETABLEFT_WCP MOVETABRIGHT_WCP %token CHANGELAYOUTOP_WCP INFIXSEARCH_WCP VOLUMEMANAGEROP_WCP %token ERROR ACTIVESIDE_WCP SHOWFREESPACE_WCP ACTIVEMODE_WCP ASK_WCP SSHALLOW_WCP FIELD_WIDTH_WCP QUICKSEARCHENABLED_WCP %token FILTEREDSEARCHENABLED_WCP XFTFONTS_WCP @@ -310,6 +310,8 @@ %token DIRCOMPAREOP_WCP %token TABPROFILESOP_WCP %token EXTERNALVDIROP_WCP +%token VDIR_PRESERVE_DIR_STRUCTURE_WCP +%token OPENTABMENUOP_WCP %type bool %type ft_type @@ -1124,7 +1126,8 @@ |viewnewestfilesop |dircompareop |tabprofilesop - |externalvdirop; + |externalvdirop + |opentabmenuop; ownop:OWNOP_WCP LEFTBRACE_WCP { lconfig_fp1 = new OwnOp(); } ownopbody RIGHTBRACE_WCP { lconfig_listcom->addElement( lconfig_fp1 ); }; @@ -1199,6 +1202,7 @@ |ENSURE_FILE_PERMISSIONS_WCP'='USER_RW_WCP';' { ((CopyOp*)lconfig_fp1)->setEnsureFilePermissions( ENSURE_USER_RW_PERMISSION ); } copyopbody |ENSURE_FILE_PERMISSIONS_WCP'='USER_RW_GROUP_R_WCP';' { ((CopyOp*)lconfig_fp1)->setEnsureFilePermissions( ENSURE_USER_RW_GROUP_R_PERMISSION ); } copyopbody |ENSURE_FILE_PERMISSIONS_WCP'='USER_RW_ALL_R_WCP';' { ((CopyOp*)lconfig_fp1)->setEnsureFilePermissions( ENSURE_USER_RW_ALL_R_PERMISSION ); } copyopbody + |VDIR_PRESERVE_DIR_STRUCTURE_WCP'='bool';' { ((CopyOp*)lconfig_fp1)->setVdirPreserveDirStructure( ( ( $3 ) == 1 ) ? true : false ); } copyopbody |; firstrow:FIRSTROW_WCP LEFTBRACE_WCP { lconfig_fp1 = new FirstRow(); } @@ -1543,6 +1547,9 @@ |TABACTION_WCP'='CLOSECURRENTTAB_WCP';' { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::CLOSE_CURRENT_TAB ); } modifytabsopbody |TABACTION_WCP'='NEXTTAB_WCP';' { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::NEXT_TAB ); } modifytabsopbody |TABACTION_WCP'='PREVTAB_WCP';' { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::PREV_TAB ); } modifytabsopbody + |TABACTION_WCP'='TOGGLELOCKSTATE_WCP';' { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::TOGGLE_LOCK_STATE ); } modifytabsopbody + |TABACTION_WCP'='MOVETABLEFT_WCP';' { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::MOVE_TAB_LEFT ); } modifytabsopbody + |TABACTION_WCP'='MOVETABRIGHT_WCP';' { ((ModifyTabsOp*)lconfig_fp1)->setTabAction( ModifyTabsOp::MOVE_TAB_RIGHT ); } modifytabsopbody |; changelayoutop:CHANGELAYOUTOP_WCP LEFTBRACE_WCP { @@ -1627,6 +1634,9 @@ externalvdiropbody:COMMANDSTRING_WCP'='STRING_WCP';' { ((ExternalVDirOp*)lconfig_fp1)->setCommandString( $3 ); } externalvdiropbody |; +opentabmenuop:OPENTABMENUOP_WCP LEFTBRACE_WCP { lconfig_fp1 = new OpenTabMenuOp(); } + RIGHTBRACE_WCP { lconfig_listcom->addElement( lconfig_fp1 ); }; + %% /**/ int yymyparse(void) diff -Nru worker-3.14.0/src/configtokens.cc worker-3.15.4/src/configtokens.cc --- worker-3.14.0/src/configtokens.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/configtokens.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* configtokens.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2003-2017 Ralf Hoffmann. + * Copyright (C) 2003-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -362,6 +362,9 @@ { CLOSECURRENTTAB_WCP, "closecurrenttab" }, { NEXTTAB_WCP, "nexttab" }, { PREVTAB_WCP, "prevtab" }, + { TOGGLELOCKSTATE_WCP, "togglelockstate" }, + { MOVETABLEFT_WCP, "movetableft" }, + { MOVETABRIGHT_WCP, "movetabright" }, { CHANGELAYOUTOP_WCP, "changelayoutop" }, { LISTVIEWWEIGHT_WCP, "listviewweight" }, { INFIXSEARCH_WCP, "infixsearch" }, @@ -438,6 +441,8 @@ { DIRCOMPAREOP_WCP, "dircompareop" }, { TABPROFILESOP_WCP, "tabprofilesop" }, { EXTERNALVDIROP_WCP, "externalvdirop" }, + { VDIR_PRESERVE_DIR_STRUCTURE_WCP, "vdirpreservedirstructure" }, + { OPENTABMENUOP_WCP, "opentabmenuop" }, }; ArrayList *tokenlist_sorted = NULL; diff -Nru worker-3.14.0/src/copycore.cc worker-3.15.4/src/copycore.cc --- worker-3.14.0/src/copycore.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/copycore.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* copycore.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2013-2015 Ralf Hoffmann. + * Copyright (C) 2013-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -32,6 +32,7 @@ #include #include #include "nwc_path.hh" +#include "nwc_os.hh" CopyCore::CopyCore( std::shared_ptr< struct copyorder > co ) : m_copyorder( co ), @@ -1672,16 +1673,19 @@ } void CopyCore::registerFEToCopy( const FileEntry &fe, - int row ) + int row, + const std::vector< NWC::OS::deep_dir_info > &file_base_segments ) { - m_copy_list.push_back( copy_base_entry( fe, row ) ); + m_copy_list.push_back( copy_base_entry( fe, row, file_base_segments ) ); } CopyCore::copy_base_entry::copy_base_entry( const FileEntry &fe, - int row ) : + int row, + const std::vector< NWC::OS::deep_dir_info > &file_base_segments ) : m_row( row ), m_cod( NULL ), - m_fe( fe ) + m_fe( fe ), + m_file_base_segments( file_base_segments ) { } @@ -1779,6 +1783,43 @@ return 0; } +int CopyCore::prepare_destination_dir( copy_base_entry &cbe, + std::string &destdir, + bool post_run ) +{ + destdir = m_copyorder->destdir; + int res = 0; + + if ( m_copyorder->vdir_preserve_dir_structure && + ! cbe.get_file_base_segments().empty() ) { + + if ( post_run == false || + m_copyorder->preserve_attr == true ) { + res = NWC::OS::make_dirs( destdir, + cbe.get_file_base_segments(), + post_run ); + + if ( res != 0 ) { + if ( m_copyorder->cowin != NULL ) m_copyorder->cowin->stoptimer(); + auto text = AGUIXUtils::formatStringToString( catalog.getLocale( 1210 ), destdir.c_str() ); + auto button = std::string( catalog.getLocale( 225 ) ) + "|" + catalog.getLocale( 8 ); + auto erg = m_copyorder->cowin->request( catalog.getLocale( 347 ), text.c_str(), button.c_str() ); + if ( erg == 0 ) { + } else { + m_cancel = true; + } + if ( m_copyorder->cowin != NULL ) m_copyorder->cowin->conttimer(); + } + } + + for ( auto &s : cbe.get_file_base_segments() ) { + destdir = NWC::Path::join( destdir, s.get_segment_name() ); + } + } + + return res; +} + int CopyCore::executeCopyThread() { for ( auto &cbe : m_copy_list ) { @@ -1805,12 +1846,23 @@ if ( tcod != NULL ) { nm_copy_t ce1; std::string target_fullname; + std::string destdir; - ce1 = copydir( &cbe.entry(), tcod, true, m_copyorder->destdir.c_str(), &target_fullname ); - if ( ce1 == NM_COPY_OK || ce1 == NM_COPY_NEED_DELETE ) { - // success - } else if ( ce1 == NM_COPY_CANCEL ) { - m_cancel = true; + if ( prepare_destination_dir( cbe, destdir, false ) == 0 ) { + ce1 = copydir( &cbe.entry(), tcod, true, destdir.c_str(), &target_fullname ); + if ( ce1 == NM_COPY_OK || ce1 == NM_COPY_NEED_DELETE ) { + // success + } else if ( ce1 == NM_COPY_CANCEL ) { + m_cancel = true; + } + + prepare_destination_dir( cbe, destdir, true ); + } else { + if ( m_cancel ) { + ce1 = NM_COPY_CANCEL; + } else { + ce1 = NM_COPY_SKIP; + } } if ( m_post_cb ) { @@ -1823,13 +1875,24 @@ } else { nm_copy_t ce1; std::string target_fullname; + std::string destdir; - ce1 = copyfile( &cbe.entry(), true, m_copyorder->destdir.c_str(), &target_fullname ); + if ( prepare_destination_dir( cbe, destdir, false ) == 0 ) { + ce1 = copyfile( &cbe.entry(), true, destdir.c_str(), &target_fullname ); - if ( ce1 == NM_COPY_OK || ce1 == NM_COPY_NEED_DELETE ) { - // success - } else if ( ce1 == NM_COPY_CANCEL ) { - m_cancel = true; + if ( ce1 == NM_COPY_OK || ce1 == NM_COPY_NEED_DELETE ) { + // success + } else if ( ce1 == NM_COPY_CANCEL ) { + m_cancel = true; + } + + prepare_destination_dir( cbe, destdir, true ); + } else { + if ( m_cancel ) { + ce1 = NM_COPY_CANCEL; + } else { + ce1 = NM_COPY_SKIP; + } } if ( m_post_cb ) { diff -Nru worker-3.14.0/src/copycore.hh worker-3.15.4/src/copycore.hh --- worker-3.14.0/src/copycore.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/copycore.hh 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* copycore.hh * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2013-2014 Ralf Hoffmann. + * Copyright (C) 2013-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -31,6 +31,7 @@ #include #include #include +#include "nwc_os_makedirs.hh" class CopyOpWin; struct copyorder; @@ -49,7 +50,8 @@ bool getCancel() const; void registerFEToCopy( const FileEntry &fe, - int row ); + int row, + const std::vector< NWC::OS::deep_dir_info > &file_base_segments ); int buildCopyDatabase(); @@ -132,18 +134,30 @@ class copy_base_entry { public: - copy_base_entry( const FileEntry &tfe, int row ); + copy_base_entry( const FileEntry &tfe, int row, + const std::vector< NWC::OS::deep_dir_info > &file_base_segments ); ~copy_base_entry(); const FileEntry &entry() const { return m_fe; } + + std::vector< NWC::OS::deep_dir_info > &get_file_base_segments() + { + return m_file_base_segments; + } + int m_row; // corresponding row or -1 NM_CopyOp_Dir *m_cod; // when fe is dir, this will be the corresponding structure private: FileEntry m_fe; // element to copy + std::vector< NWC::OS::deep_dir_info > m_file_base_segments; }; + int prepare_destination_dir( copy_base_entry &cbe, + std::string &destdir, + bool post_run ); + std::list< copy_base_entry > m_copy_list; std::function< void( loff_t size, int row, bool is_dir ) > m_pre_cb; diff -Nru worker-3.14.0/src/copyop.cc worker-3.15.4/src/copyop.cc --- worker-3.14.0/src/copyop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/copyop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* copyop.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2015 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -47,6 +47,7 @@ request_flags=false; overwrite=COPYOP_OVERWRITE_NORMAL; preserve_attr=true; + vdir_preserve_dir_structure = false; adjust_relative_symlinks = COPYOP_ADJUST_SYMLINK_NEVER; ensure_file_permissions = LEAVE_PERMISSIONS_UNMODIFIED; hasConfigure = true; @@ -69,6 +70,7 @@ ta->request_flags=request_flags; ta->overwrite=overwrite; ta->preserve_attr=preserve_attr; + ta->vdir_preserve_dir_structure = vdir_preserve_dir_structure; ta->adjust_relative_symlinks = adjust_relative_symlinks; ta->ensure_file_permissions = ensure_file_permissions; return ta; @@ -133,6 +135,10 @@ } fh->configPutPairBool( "preserveattr", preserve_attr ); + if ( vdir_preserve_dir_structure == true ) { + fh->configPutPairBool( "vdirpreservedirstructure", vdir_preserve_dir_structure ); + } + switch ( adjust_relative_symlinks ) { case COPYOP_ADJUST_SYMLINK_OUTSIDE: fh->configPutPair( "adjustrelativesymlinks", "outside" ); @@ -200,6 +206,7 @@ trequest_dest=request_dest; toverwrite=overwrite; tpreserve_attr=preserve_attr; + tvdir_preserve_dir_structure = vdir_preserve_dir_structure; tadjust_relative_symlinks = adjust_relative_symlinks; tensure_file_permissions = ensure_file_permissions; } @@ -352,6 +359,7 @@ co->move=tmove; co->follow_symlinks=tfollow_symlinks; co->preserve_attr=tpreserve_attr; + co->vdir_preserve_dir_structure = tvdir_preserve_dir_structure; switch ( tadjust_relative_symlinks ) { case COPYOP_ADJUST_SYMLINK_OUTSIDE: @@ -420,7 +428,7 @@ win->create(); _freesafe(tstr); - AContainer *ac1 = win->setContainer( new AContainer( win, 1, 11 ), true ); + AContainer *ac1 = win->setContainer( new AContainer( win, 1, 12 ), true ); ac1->setMinSpace( 5 ); ac1->setMaxSpace( 5 ); @@ -528,12 +536,15 @@ if(tw>w) w=tw; x=5;*/ + auto vdirpreserve_cb = ac1->addWidget( new ChooseButton( aguix, 0, 0, 20, 20, ( vdir_preserve_dir_structure == true ) ? 1 : 0, + catalog.getLocale( 1209 ), LABEL_RIGHT, 0 ), 0, 9, cincwnr ); + if(mode==0) { rfcb = (ChooseButton*)ac1->add( new ChooseButton( aguix, 0, 0, 20, 20, ( request_flags == true ) ? 1 : 0, - catalog.getLocale( 294 ), LABEL_RIGHT, 0 ), 0, 9, cincwnr ); + catalog.getLocale( 294 ), LABEL_RIGHT, 0 ), 0, 10, cincwnr ); } - AContainer *ac1_2 = ac1->add( new AContainer( win, 2, 1 ), 0, 10 ); + AContainer *ac1_2 = ac1->add( new AContainer( win, 2, 1 ), 0, 11 ); ac1_2->setMinSpace( 5 ); ac1_2->setMaxSpace( -1 ); ac1_2->setBorderWidth( 0 ); @@ -591,6 +602,9 @@ case XK_8: ep_cyb->setOption( ( ep_cyb->getSelectedOption() + 1 ) % 4 ); break; + case XK_9: + vdirpreserve_cb->setState( ( vdirpreserve_cb->getState() == true ) ? false : true ); + break; case XK_Return: if ( cb->getHasFocus() == false ) { endmode = 0; @@ -617,6 +631,7 @@ tsame_dir = sdcb->getState(); trequest_dest = rdcb->getState(); tpreserve_attr = pacb->getState(); + tvdir_preserve_dir_structure = vdirpreserve_cb->getState(); switch ( ars_cyb->getSelectedOption() ) { case 1: @@ -666,6 +681,7 @@ request_dest = rdcb->getState(); request_flags = rfcb->getState(); preserve_attr = pacb->getState(); + vdir_preserve_dir_structure = vdirpreserve_cb->getState(); switch ( ars_cyb->getSelectedOption() ) { case 1: @@ -803,6 +819,11 @@ preserve_attr=nv; } +void CopyOp::setVdirPreserveDirStructure(bool nv) +{ + vdir_preserve_dir_structure = nv; +} + void CopyOp::setAdjustRelativeSymlinks( adjust_relative_symlinks_t nv ) { adjust_relative_symlinks = nv; @@ -812,3 +833,13 @@ { ensure_file_permissions = nv; } + +bool CopyOp::isInteractiveRun() const +{ + return true; +} + +void CopyOp::setInteractiveRun() +{ + request_flags = true; +} diff -Nru worker-3.14.0/src/copyop.h worker-3.15.4/src/copyop.h --- worker-3.14.0/src/copyop.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/copyop.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* copyop.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2015 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -54,6 +54,7 @@ void setRequestFlags(bool); void setOverwrite(overwrite_t); void setPreserveAttr(bool); + void setVdirPreserveDirStructure(bool); typedef enum { COPYOP_ADJUST_SYMLINK_NEVER, COPYOP_ADJUST_SYMLINK_OUTSIDE, @@ -62,6 +63,8 @@ void setAdjustRelativeSymlinks( adjust_relative_symlinks_t nv ); void setEnsureFilePermissions( const CopyParams::EnsureFilePermissions &nv ); + bool isInteractiveRun() const; + void setInteractiveRun(); protected: static const char *name; // Infos to save @@ -71,6 +74,7 @@ bool same_dir; bool request_dest; bool preserve_attr; + bool vdir_preserve_dir_structure; adjust_relative_symlinks_t adjust_relative_symlinks; CopyParams::EnsureFilePermissions ensure_file_permissions; bool request_flags; @@ -87,6 +91,7 @@ bool tsame_dir; bool trequest_dest; bool tpreserve_attr; + bool tvdir_preserve_dir_structure; adjust_relative_symlinks_t tadjust_relative_symlinks; CopyParams::EnsureFilePermissions tensure_file_permissions; overwrite_t toverwrite; diff -Nru worker-3.14.0/src/copyorder.cc worker-3.15.4/src/copyorder.cc --- worker-3.14.0/src/copyorder.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/copyorder.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* copyorder.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2014-2015 Ralf Hoffmann. + * Copyright (C) 2014-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -30,6 +30,7 @@ follow_symlinks( false ), do_rename( false ), preserve_attr( true ), + vdir_preserve_dir_structure( false ), overwrite( COPY_OVERWRITE_NORMAL ), adjust_relative_symlinks( COPY_ADJUST_SYMLINK_NEVER ), ensure_file_permissions( CopyParams::LEAVE_PERMISSIONS_UNMODIFIED ), diff -Nru worker-3.14.0/src/copyorder.hh worker-3.15.4/src/copyorder.hh --- worker-3.14.0/src/copyorder.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/copyorder.hh 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* copyorder.hh * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2013-2015 Ralf Hoffmann. + * Copyright (C) 2013-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -43,6 +43,7 @@ bool follow_symlinks; bool do_rename; bool preserve_attr; + bool vdir_preserve_dir_structure; enum { COPY_OVERWRITE_NORMAL, COPY_OVERWRITE_ALWAYS, COPY_OVERWRITE_NEVER } overwrite; /* _NORMAL: Request what to do _ALWAYS: overwrite without request diff -Nru worker-3.14.0/src/createsymlinkop.cc worker-3.15.4/src/createsymlinkop.cc --- worker-3.14.0/src/createsymlinkop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/createsymlinkop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* createsymlinkop.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2014 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -337,3 +337,12 @@ requestflags=nv; } +bool CreateSymlinkOp::isInteractiveRun() const +{ + return true; +} + +void CreateSymlinkOp::setInteractiveRun() +{ + requestflags = true; +} diff -Nru worker-3.14.0/src/createsymlinkop.h worker-3.15.4/src/createsymlinkop.h --- worker-3.14.0/src/createsymlinkop.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/createsymlinkop.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* createsymlinkop.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2004,2011 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -49,6 +49,8 @@ void setSameDir(bool); void setLocal(bool); void setRequestFlags(bool); + bool isInteractiveRun() const; + void setInteractiveRun(); protected: static const char *name; // Infos to save diff -Nru worker-3.14.0/src/dirsortsettings.cc worker-3.15.4/src/dirsortsettings.cc --- worker-3.14.0/src/dirsortsettings.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/dirsortsettings.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* dirsortsettings.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2007,2012-2013 Ralf Hoffmann. + * Copyright (C) 2007-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -33,12 +33,6 @@ { } -bool DirSortSettings::check( Verzeichnis &v ) -{ - v.sort( _sort_mode ); - return true; -} - bool DirSortSettings::check( std::vector< NWCEntrySelectionState > &d ) { std::sort( d.begin(), diff -Nru worker-3.14.0/src/dirsortsettings.hh worker-3.15.4/src/dirsortsettings.hh --- worker-3.14.0/src/dirsortsettings.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/dirsortsettings.hh 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* dirsortsettings.hh * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2007,2012 Ralf Hoffmann. + * Copyright (C) 2007-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -31,7 +31,6 @@ DirSortSettings(); ~DirSortSettings(); - bool check( class Verzeichnis &v ); bool check( std::vector< class NWCEntrySelectionState > &d ); int getSerialNr() const; diff -Nru worker-3.14.0/src/dmcacheentrynwc.cc worker-3.15.4/src/dmcacheentrynwc.cc --- worker-3.14.0/src/dmcacheentrynwc.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/dmcacheentrynwc.cc 2019-01-28 21:40:22.000000000 +0000 @@ -88,7 +88,7 @@ // now apply old values DirSortSettings sorter; - sorter.setSortMode( SORT_NAME | SORT_DIRMIXED ); + sorter.setSortMode( SORT_STRICT_NAME | SORT_DIRMIXED ); sorter.check( m_entries ); sorter.check( old_entries ); @@ -139,8 +139,9 @@ auto old_fse = old_es_it->getNWCEntry(); if ( old_fse != NULL ) { - int comp = StringComparator::compare( old_fse->getFullname(), - new_fse->getFullname() ); + int comp = NWCEntrySelectionState::sortfunction( *old_es_it, + new_es, + SORT_STRICT_NAME | SORT_DIRMIXED ); if ( comp > 0 ) { // old larger than new so skip to next new element diff -Nru worker-3.14.0/src/exprfilter_scanner.cc worker-3.15.4/src/exprfilter_scanner.cc --- worker-3.14.0/src/exprfilter_scanner.cc 2017-12-08 22:28:40.000000000 +0000 +++ worker-3.15.4/src/exprfilter_scanner.cc 2019-01-28 21:41:43.000000000 +0000 @@ -1,30 +1,30 @@ #line 1 "exprfilter_scanner.rl" /* exprfilter_scanner.rl - * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2014-2016 Ralf Hoffmann. - * You can contact me at: ralf@boomerangsworld.de - * or http://www.boomerangsworld.de/worker - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ +* This file belongs to Worker, a file manager for UN*X/X11. +* Copyright (C) 2014-2016 Ralf Hoffmann. +* You can contact me at: ralf@boomerangsworld.de +* or http://www.boomerangsworld.de/worker +* +* This program 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. +* +* This program 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 this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ /* - * to generate output, run - * ragel exprfilter_scanner.rl -o exprfilter_scanner.cc - */ +* to generate output, run +* ragel exprfilter_scanner.rl -o exprfilter_scanner.cc +*/ #include "exprfilter_scanner.hh" @@ -33,92 +33,167 @@ -#line 37 "exprfilter_scanner.cc" static const char _expr_parser_actions[] = { - 0, 1, 0, 1, 1, 1, 2, 1, - 3, 1, 4, 1, 5, 1, 6, 1, - 7, 1, 8, 1, 9, 1, 10, 1, - 11, 1, 12, 1, 13, 1, 14, 1, - 15, 1, 16, 1, 17, 1, 18, 1, - 19, 1, 20, 1, 21, 1, 22 + 0, 1, 0, 1, 1, 1, 2, 1, + 3, 1, 4, 1, 5, 1, 6, 1, + 7, 1, 8, 1, 9, 1, 10, 1, + 11, 1, 12, 1, 13, 1, 14, 1, + 15, 1, 16, 1, 17, 1, 18, 1, + 19, 1, 20, 1, 21, 1, 22, 0 }; static const char _expr_parser_key_offsets[] = { - 0, 0, 1, 2, 4, 6, 7, 9, - 11, 26, 37, 38, 40, 42, 44, 47, - 49, 50, 51, 52 + 0, 0, 1, 2, 4, 6, 7, 9, + 11, 26, 37, 38, 40, 42, 44, 47, + 49, 50, 51, 52, 0 }; static const char _expr_parser_trans_keys[] = { - 61, 34, 48, 57, 48, 57, 45, 48, - 57, 48, 57, 32, 33, 34, 38, 40, - 41, 60, 61, 62, 124, 126, 9, 13, - 48, 57, 38, 124, 126, 9, 13, 32, - 33, 40, 41, 60, 62, 38, 48, 57, - 48, 57, 48, 57, 45, 48, 57, 48, + 61, 34, 48, 57, 48, 57, 45, 48, + 57, 48, 57, 32, 33, 34, 38, 40, + 41, 60, 61, 62, 124, 126, 9, 13, + 48, 57, 38, 124, 126, 9, 13, 32, + 33, 40, 41, 60, 62, 38, 48, 57, + 48, 57, 48, 57, 45, 48, 57, 48, 57, 61, 61, 61, 124, 0 }; static const char _expr_parser_single_lengths[] = { - 0, 1, 1, 0, 0, 1, 0, 0, - 11, 3, 1, 0, 0, 0, 1, 0, - 1, 1, 1, 1 + 0, 1, 1, 0, 0, 1, 0, 0, + 11, 3, 1, 0, 0, 0, 1, 0, + 1, 1, 1, 1, 0 }; static const char _expr_parser_range_lengths[] = { - 0, 0, 0, 1, 1, 0, 1, 1, - 2, 4, 0, 1, 1, 1, 1, 1, - 0, 0, 0, 0 + 0, 0, 0, 1, 1, 0, 1, 1, + 2, 4, 0, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0 }; static const char _expr_parser_index_offsets[] = { - 0, 0, 2, 4, 6, 8, 10, 12, - 14, 28, 36, 38, 40, 42, 44, 47, - 49, 51, 53, 55 -}; - -static const char _expr_parser_trans_targs[] = { - 8, 0, 8, 2, 4, 8, 5, 8, - 6, 8, 7, 8, 8, 8, 8, 1, - 2, 10, 8, 8, 16, 17, 18, 19, - 8, 8, 11, 9, 8, 8, 8, 8, - 8, 8, 8, 9, 8, 8, 12, 8, - 13, 8, 14, 8, 3, 15, 8, 15, - 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, + 0, 0, 2, 4, 6, 8, 10, 12, + 14, 28, 36, 38, 40, 42, 44, 47, + 49, 51, 53, 55, 0 +}; + +static const signed char _expr_parser_trans_cond_spaces[] = { + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, 0 +}; + +static const char _expr_parser_trans_offsets[] = { + 0, 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, 67, 68, 69, 70, 71, + 72, 0 +}; + +static const char _expr_parser_trans_lengths[] = { + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0 +}; + +static const char _expr_parser_cond_keys[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0 +}; + +static const char _expr_parser_cond_targs[] = { + 8, 0, 8, 2, 4, 8, 5, 8, + 6, 8, 7, 8, 8, 8, 8, 1, + 2, 10, 8, 8, 16, 17, 18, 19, + 8, 8, 11, 9, 8, 8, 8, 8, + 8, 8, 8, 9, 8, 8, 12, 8, + 13, 8, 14, 8, 3, 15, 8, 15, + 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 0 }; -static const char _expr_parser_trans_actions[] = { - 11, 0, 27, 0, 0, 45, 0, 45, - 0, 45, 0, 45, 25, 45, 29, 0, - 0, 0, 21, 23, 0, 0, 0, 0, - 15, 29, 0, 0, 41, 41, 41, 41, - 41, 41, 41, 0, 17, 37, 0, 43, - 0, 43, 5, 43, 0, 0, 43, 0, - 43, 7, 31, 9, 33, 13, 35, 19, - 39, 45, 45, 45, 45, 45, 41, 37, - 43, 43, 43, 43, 43, 31, 33, 35, +static const char _expr_parser_cond_actions[] = { + 11, 0, 27, 0, 0, 45, 0, 45, + 0, 45, 0, 45, 25, 45, 29, 0, + 0, 0, 21, 23, 0, 0, 0, 0, + 15, 29, 0, 0, 41, 41, 41, 41, + 41, 41, 41, 0, 17, 37, 0, 43, + 0, 43, 5, 43, 0, 0, 43, 0, + 43, 7, 31, 9, 33, 13, 35, 19, + 39, 45, 45, 45, 45, 45, 41, 37, + 43, 43, 43, 43, 43, 31, 33, 35, 39, 0 }; static const char _expr_parser_to_state_actions[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0 }; static const char _expr_parser_from_state_actions[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0 +}; + +static const char _expr_parser_eof_trans_indexed[] = { + 0, 0, 0, 11, 11, 11, 11, 11, + 0, 17, 18, 20, 20, 20, 20, 20, + 21, 23, 25, 27, 0 +}; + +static const char _expr_parser_eof_trans_direct[] = { + 0, 0, 0, 58, 59, 60, 61, 62, + 0, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 0 +}; + +static const char _expr_parser_nfa_targs[] = { + 0, 0 +}; + +static const char _expr_parser_nfa_offsets[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0 +}; + +static const char _expr_parser_nfa_push_actions[] = { + 0, 0 }; -static const char _expr_parser_eof_trans[] = { - 0, 0, 0, 62, 62, 62, 62, 62, - 0, 63, 64, 69, 69, 69, 69, 69, - 70, 71, 72, 73 +static const char _expr_parser_nfa_pop_trans[] = { + 0, 0 }; static const int expr_parser_start = 8; @@ -129,6 +204,7 @@ #line 60 "exprfilter_scanner.rl" + int exprfilter_scan_expr( const std::string &input, std::list< ExprToken > &output_tokens ) { const char *p = input.c_str(); @@ -136,215 +212,329 @@ const char *eof = pe; const char *ts = NULL, *te = NULL; int cs = expr_parser_start; - -#line 142 "exprfilter_scanner.cc" + { - int _klen; - unsigned int _trans; - const char *_acts; - unsigned int _nacts; - const char *_keys; - - if ( p == pe ) - goto _test_eof; - if ( cs == 0 ) - goto _out; -_resume: - _acts = _expr_parser_actions + _expr_parser_from_state_actions[cs]; - _nacts = (unsigned int) *_acts++; - while ( _nacts-- > 0 ) { - switch ( *_acts++ ) { - case 1: -#line 1 "NONE" - {ts = p;} - break; -#line 163 "exprfilter_scanner.cc" - } - } - - _keys = _expr_parser_trans_keys + _expr_parser_key_offsets[cs]; - _trans = _expr_parser_index_offsets[cs]; - - _klen = _expr_parser_single_lengths[cs]; - if ( _klen > 0 ) { - const char *_lower = _keys; - const char *_mid; - const char *_upper = _keys + _klen - 1; - while (1) { - if ( _upper < _lower ) - break; - - _mid = _lower + ((_upper-_lower) >> 1); - if ( (*p) < *_mid ) - _upper = _mid - 1; - else if ( (*p) > *_mid ) - _lower = _mid + 1; - else { - _trans += (unsigned int)(_mid - _keys); - goto _match; + int _klen; + unsigned int _trans = 0; + unsigned int _cond = 0; + const char *_acts; + unsigned int _nacts; + const char *_keys; + const char *_ckeys; + int _cpc; + { + + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; + _resume: { + _acts = ( _expr_parser_actions + (_expr_parser_from_state_actions[cs])); + _nacts = (unsigned int)(*( _acts)); + _acts += 1; + while ( _nacts > 0 ) { + switch ( (*( _acts)) ) { + case 1: { + { + #line 1 "NONE" + {ts = p;}} + break; } + } + _nacts -= 1; + _acts += 1; + } + + _keys = ( _expr_parser_trans_keys + (_expr_parser_key_offsets[cs])); + _trans = (unsigned int)_expr_parser_index_offsets[cs]; + + _klen = (int)_expr_parser_single_lengths[cs]; + if ( _klen > 0 ) { + const char *_lower; + const char *_mid; + const char *_upper; + _lower = _keys; + _upper = _keys + _klen - 1; + while ( 1 ) { + if ( _upper < _lower ) + break; + + _mid = _lower + ((_upper-_lower) >> 1); + if ( ( (*( p))) < (*( _mid)) ) + _upper = _mid - 1; + else if ( ( (*( p))) > (*( _mid)) ) + _lower = _mid + 1; + else { + _trans += (unsigned int)(_mid - _keys); + goto _match; + } + } + _keys += _klen; + _trans += (unsigned int)_klen; + } + + _klen = (int)_expr_parser_range_lengths[cs]; + if ( _klen > 0 ) { + const char *_lower; + const char *_mid; + const char *_upper; + _lower = _keys; + _upper = _keys + (_klen<<1) - 2; + while ( 1 ) { + if ( _upper < _lower ) + break; + + _mid = _lower + (((_upper-_lower) >> 1) & ~1); + if ( ( (*( p))) < (*( _mid)) ) + _upper = _mid - 2; + else if ( ( (*( p))) > (*( _mid + 1)) ) + _lower = _mid + 2; + else { + _trans += (unsigned int)((_mid - _keys)>>1); + goto _match; + } + } + _trans += (unsigned int)_klen; + } + } - } - _keys += _klen; - _trans += _klen; - } - - _klen = _expr_parser_range_lengths[cs]; - if ( _klen > 0 ) { - const char *_lower = _keys; - const char *_mid; - const char *_upper = _keys + (_klen<<1) - 2; - while (1) { - if ( _upper < _lower ) - break; - - _mid = _lower + (((_upper-_lower) >> 1) & ~1); - if ( (*p) < _mid[0] ) - _upper = _mid - 2; - else if ( (*p) > _mid[1] ) - _lower = _mid + 2; - else { - _trans += (unsigned int)((_mid - _keys)>>1); - goto _match; + _match: { + _ckeys = ( _expr_parser_cond_keys + (_expr_parser_trans_offsets[_trans])); + _klen = (int)_expr_parser_trans_lengths[_trans]; + _cond = (unsigned int)_expr_parser_trans_offsets[_trans]; + + _cpc = 0; + { + const char *_lower; + const char *_mid; + const char *_upper; + _lower = _ckeys; + _upper = _ckeys + _klen - 1; + while ( 1 ) { + if ( _upper < _lower ) + break; + + _mid = _lower + ((_upper-_lower) >> 1); + if ( _cpc < (int)(*( _mid)) ) + _upper = _mid - 1; + else if ( _cpc > (int)(*( _mid)) ) + _lower = _mid + 1; + else { + _cond += (unsigned int)(_mid - _ckeys); + goto _match_cond; + } + } + cs = 0; + goto _again; + } + } + _match_cond: { + cs = (int)_expr_parser_cond_targs[_cond]; + + if ( _expr_parser_cond_actions[_cond] == 0 ) + goto _again; + + _acts = ( _expr_parser_actions + (_expr_parser_cond_actions[_cond])); + _nacts = (unsigned int)(*( _acts)); + _acts += 1; + while ( _nacts > 0 ) + { + switch ( (*( _acts)) ) + { + case 2: { + { + #line 1 "NONE" + {te = p+1;}} + break; } + case 3: { + { + #line 38 "exprfilter_scanner.rl" + {te = p+1;{ + #line 38 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::LE, s1 ) ); }}} + break; } + case 4: { + { + #line 40 "exprfilter_scanner.rl" + {te = p+1;{ + #line 40 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::EQ, s1 ) ); }}} + break; } + case 5: { + { + #line 41 "exprfilter_scanner.rl" + {te = p+1;{ + #line 41 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::NE, s1 ) ); }}} + break; } + case 6: { + { + #line 42 "exprfilter_scanner.rl" + {te = p+1;{ + #line 42 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::GE, s1 ) ); }}} + break; } + case 7: { + { + #line 44 "exprfilter_scanner.rl" + {te = p+1;{ + #line 44 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::APPROX, s1 ) ); }}} + break; } + case 8: { + { + #line 47 "exprfilter_scanner.rl" + {te = p+1;{ + #line 47 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::AND, s1 ) ); }}} + break; } + case 9: { + { + #line 48 "exprfilter_scanner.rl" + {te = p+1;{ + #line 48 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::OR, s1 ) ); }}} + break; } + case 10: { + { + #line 49 "exprfilter_scanner.rl" + {te = p+1;{ + #line 49 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::OPEN_PAR, s1 ) ); }}} + break; } + case 11: { + { + #line 50 "exprfilter_scanner.rl" + {te = p+1;{ + #line 50 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::CLOSE_PAR, s1 ) ); }}} + break; } + case 12: { + { + #line 51 "exprfilter_scanner.rl" + {te = p+1;{ + #line 51 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::DATE, s1 ) ); }}} + break; } + case 13: { + { + #line 53 "exprfilter_scanner.rl" + {te = p+1;{ + #line 53 "exprfilter_scanner.rl" + if ( te - ts >= 2 ) { std::string s1( ts + 1, te - ts - 2 ); output_tokens.push_back( ExprToken( ExprToken::WORD, s1 ) ); } }}} + break; } + case 14: { + { + #line 1 "-" + {te = p+1;}} + break; } + case 15: { + { + #line 37 "exprfilter_scanner.rl" + {te = p;p = p - 1;{ + #line 37 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::LT, s1 ) ); }}} + break; } + case 16: { + { + #line 39 "exprfilter_scanner.rl" + {te = p;p = p - 1;{ + #line 39 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::EQ, s1 ) ); }}} + break; } + case 17: { + { + #line 43 "exprfilter_scanner.rl" + {te = p;p = p - 1;{ + #line 43 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::GT, s1 ) ); }}} + break; } + case 18: { + { + #line 45 "exprfilter_scanner.rl" + {te = p;p = p - 1;{ + #line 45 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::AND, s1 ) ); }}} + break; } + case 19: { + { + #line 46 "exprfilter_scanner.rl" + {te = p;p = p - 1;{ + #line 46 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::OR, s1 ) ); }}} + break; } + case 20: { + { + #line 52 "exprfilter_scanner.rl" + {te = p;p = p - 1;{ + #line 52 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::WORD, s1 ) ); }}} + break; } + case 21: { + { + #line 54 "exprfilter_scanner.rl" + {te = p;p = p - 1;{ + #line 54 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::NUMBER, s1 ) ); }}} + break; } + case 22: { + { + #line 54 "exprfilter_scanner.rl" + {p = ((te))-1; + { + #line 54 "exprfilter_scanner.rl" + std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::NUMBER, s1 ) ); }}} + break; } + } + _nacts -= 1; + _acts += 1; + } + + + } + _again: { + _acts = ( _expr_parser_actions + (_expr_parser_to_state_actions[cs])); + _nacts = (unsigned int)(*( _acts)); + _acts += 1; + while ( _nacts > 0 ) { + switch ( (*( _acts)) ) { + case 0: { + { + #line 1 "NONE" + {ts = 0;}} + break; } + } + _nacts -= 1; + _acts += 1; + } + + if ( cs == 0 ) + goto _out; + p += 1; + if ( p != pe ) + goto _resume; + } + _test_eof: { {} + if ( p == eof ) + { + if ( _expr_parser_eof_trans_direct[cs] > 0 ) { + _trans = (unsigned int)_expr_parser_eof_trans_direct[cs] - 1; + _cond = (unsigned int)_expr_parser_trans_offsets[_trans]; + goto _match_cond; + } + } + + } + _out: { {} } - } - _trans += _klen; - } - -_match: -_eof_trans: - cs = _expr_parser_trans_targs[_trans]; - - if ( _expr_parser_trans_actions[_trans] == 0 ) - goto _again; - - _acts = _expr_parser_actions + _expr_parser_trans_actions[_trans]; - _nacts = (unsigned int) *_acts++; - while ( _nacts-- > 0 ) - { - switch ( *_acts++ ) - { - case 2: -#line 1 "NONE" - {te = p+1;} - break; - case 3: -#line 38 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::LE, s1 ) ); }} - break; - case 4: -#line 40 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::EQ, s1 ) ); }} - break; - case 5: -#line 41 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::NE, s1 ) ); }} - break; - case 6: -#line 42 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::GE, s1 ) ); }} - break; - case 7: -#line 44 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::APPROX, s1 ) ); }} - break; - case 8: -#line 47 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::AND, s1 ) ); }} - break; - case 9: -#line 48 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::OR, s1 ) ); }} - break; - case 10: -#line 49 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::OPEN_PAR, s1 ) ); }} - break; - case 11: -#line 50 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::CLOSE_PAR, s1 ) ); }} - break; - case 12: -#line 51 "exprfilter_scanner.rl" - {te = p+1;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::DATE, s1 ) ); }} - break; - case 13: -#line 53 "exprfilter_scanner.rl" - {te = p+1;{ if ( te - ts >= 2 ) { std::string s1( ts + 1, te - ts - 2 ); output_tokens.push_back( ExprToken( ExprToken::WORD, s1 ) ); } }} - break; - case 14: -#line 55 "exprfilter_scanner.rl" - {te = p+1;} - break; - case 15: -#line 37 "exprfilter_scanner.rl" - {te = p;p--;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::LT, s1 ) ); }} - break; - case 16: -#line 39 "exprfilter_scanner.rl" - {te = p;p--;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::EQ, s1 ) ); }} - break; - case 17: -#line 43 "exprfilter_scanner.rl" - {te = p;p--;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::GT, s1 ) ); }} - break; - case 18: -#line 45 "exprfilter_scanner.rl" - {te = p;p--;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::AND, s1 ) ); }} - break; - case 19: -#line 46 "exprfilter_scanner.rl" - {te = p;p--;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::OR, s1 ) ); }} - break; - case 20: -#line 52 "exprfilter_scanner.rl" - {te = p;p--;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::WORD, s1 ) ); }} - break; - case 21: -#line 54 "exprfilter_scanner.rl" - {te = p;p--;{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::NUMBER, s1 ) ); }} - break; - case 22: -#line 54 "exprfilter_scanner.rl" - {{p = ((te))-1;}{ std::string s1( ts, te - ts ); output_tokens.push_back( ExprToken( ExprToken::NUMBER, s1 ) ); }} - break; -#line 312 "exprfilter_scanner.cc" - } - } - -_again: - _acts = _expr_parser_actions + _expr_parser_to_state_actions[cs]; - _nacts = (unsigned int) *_acts++; - while ( _nacts-- > 0 ) { - switch ( *_acts++ ) { - case 0: -#line 1 "NONE" - {ts = 0;} - break; -#line 325 "exprfilter_scanner.cc" } } - - if ( cs == 0 ) - goto _out; - if ( ++p != pe ) - goto _resume; - _test_eof: {} - if ( p == eof ) - { - if ( _expr_parser_eof_trans[cs] > 0 ) { - _trans = _expr_parser_eof_trans[cs] - 1; - goto _eof_trans; - } - } - - _out: {} - } - -#line 70 "exprfilter_scanner.rl" - + + #line 70 "exprfilter_scanner.rl" + + if (cs == expr_parser_error) - return -1; - + return -1; + return 0; } diff -Nru worker-3.14.0/src/externalvdirop.cc worker-3.15.4/src/externalvdirop.cc --- worker-3.14.0/src/externalvdirop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/externalvdirop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* externalvdirop.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2017 Ralf Hoffmann. + * Copyright (C) 2017-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -32,6 +32,7 @@ #include #include #include "virtualdirmode.hh" +#include "nwc_path.hh" int ExternalVDirOp::s_vdir_number = 1; @@ -103,6 +104,8 @@ fullname += l; } + fullname = NWC::Path::normalize( fullname ); + NWC::FSEntry fse( fullname ); if ( fse.entryExists() ) { vdir->add( fse ); diff -Nru worker-3.14.0/src/fontreq.cc worker-3.15.4/src/fontreq.cc --- worker-3.14.0/src/fontreq.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/fontreq.cc 2019-01-28 21:40:22.000000000 +0000 @@ -82,7 +82,7 @@ "-*-helvetica-medium-o-*-*-%d-*-*-*-*-*-*-*", 0}, { "helvetica bold italic", FontRequester::request_fonts::SCALABLE, "-*-helvetica-bold-o-*-*-%d-*-*-*-*-*-*-*", 0}, - { "any font famliy", FontRequester::request_fonts::SCALABLE, + { "any font family", FontRequester::request_fonts::SCALABLE, "-*-*-medium-r-*-*-%d-*-*-*-*-*-*-*", 0}, { "generic", FontRequester::request_fonts::SCALABLE, "-*-*-*-*-*-*-%d-*-*-*-*-*-*-*", 0} diff -Nru worker-3.14.0/src/functionproto.cc worker-3.15.4/src/functionproto.cc --- worker-3.14.0/src/functionproto.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/functionproto.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* functionproto.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2008,2011 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -237,3 +237,12 @@ return res; } + +bool FunctionProto::isInteractiveRun() const +{ + return false; +} + +void FunctionProto::setInteractiveRun() +{ +} diff -Nru worker-3.14.0/src/functionproto.h worker-3.15.4/src/functionproto.h --- worker-3.14.0/src/functionproto.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/functionproto.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* functionproto.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2008,2011 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -112,6 +112,9 @@ virtual command_categories_t getCategory() const; virtual std::string getStringRepresentation(); + + virtual bool isInteractiveRun() const; + virtual void setInteractiveRun(); protected: static const char *name; bool hasConfigure; diff -Nru worker-3.14.0/src/goftpop.cc worker-3.15.4/src/goftpop.cc --- worker-3.14.0/src/goftpop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/goftpop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* goftpop.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2005-2014 Ralf Hoffmann. + * Copyright (C) 2005-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -458,3 +458,13 @@ return l; } + +bool GoFTPOp::isInteractiveRun() const +{ + return true; +} + +void GoFTPOp::setInteractiveRun() +{ + requestflags = true; +} diff -Nru worker-3.14.0/src/goftpop.h worker-3.15.4/src/goftpop.h --- worker-3.14.0/src/goftpop.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/goftpop.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* goftpop.h - * This file belongs to Worker, a filemanager for UNIX/X11. - * Copyright (C) 2005-2007 Ralf Hoffmann. + * This file belongs to Worker, a file manager for UN&X/X11. + * Copyright (C) 2005-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -54,6 +54,9 @@ void setPass( std::string ); void setAlwaysStorePW( bool ); void setAVFSModule( const std::string & ); + bool isInteractiveRun() const; + void setInteractiveRun(); + static const char *name; protected: // Infos to save diff -Nru worker-3.14.0/src/intviewop.cc worker-3.15.4/src/intviewop.cc --- worker-3.14.0/src/intviewop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/intviewop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* intviewop.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2005-2015 Ralf Hoffmann. + * Copyright (C) 2005-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -368,3 +368,13 @@ { _custom_files = nv; } + +bool InternalViewOp::isInteractiveRun() const +{ + return true; +} + +void InternalViewOp::setInteractiveRun() +{ + _request_flags = true; +} diff -Nru worker-3.14.0/src/intviewop.h worker-3.15.4/src/intviewop.h --- worker-3.14.0/src/intviewop.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/intviewop.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* intviewop.h - * This file belongs to Worker, a filemanager for UNIX/X11. - * Copyright (C) 2005-2006 Ralf Hoffmann. + * This file belongs to Worker, a file manager for UN*X/X11. + * Copyright (C) 2005-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -54,6 +54,8 @@ void setRequestFlags( bool ); void setShowFileMode( show_file_mode_t ); void setCustomFiles( std::string ); + bool isInteractiveRun() const; + void setInteractiveRun(); static const char *name; protected: diff -Nru worker-3.14.0/src/listermode.cc worker-3.15.4/src/listermode.cc --- worker-3.14.0/src/listermode.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/listermode.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* listermode.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2014 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -128,8 +128,8 @@ void ListerMode::runCommand( const std::string &command ) { if ( m_commands.count( command ) > 0 && - m_commands[command].getVal() != NULL ) { - m_commands[command]->callback(); + m_commands[command] != NULL ) { + m_commands[command](); } else { std::string text = AGUIXUtils::formatStringToString( catalog.getLocale( 993 ), command.c_str() ); @@ -141,16 +141,16 @@ } void ListerMode::registerCommand( const std::string &command, - const RefCount< GenericCallback< void > > &callback ) + std::function< void (void) > callback ) { - m_commands[command] = callback; + m_commands[ command ] = callback; } void ListerMode::runCommand( const std::string &command, const std::list< RefCount< ArgClass > > &args ) { if ( m_commands_with_args.count( command ) > 0 && - m_commands_with_args[command].getVal() != NULL ) { - m_commands_with_args[command]->callback( args ); + m_commands_with_args[command] != NULL ) { + m_commands_with_args[command]( args ); } else { std::string text = AGUIXUtils::formatStringToString( catalog.getLocale( 993 ), command.c_str() ); @@ -162,7 +162,7 @@ } void ListerMode::registerCommand( const std::string &command, - const RefCount< GenericCallbackArg< void, const std::list< RefCount< ArgClass > > & > > &callback ) + const std::function< void ( const std::list< RefCount< ArgClass > > ) > callback ) { m_commands_with_args[command] = callback; } diff -Nru worker-3.14.0/src/listermode.h worker-3.15.4/src/listermode.h --- worker-3.14.0/src/listermode.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/listermode.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* listermode.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2014 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -29,6 +29,7 @@ #include "lister.h" #include "nmspecialsourceext.hh" #include +#include class ArgClass; class Datei; @@ -69,9 +70,9 @@ virtual void runCommand( const std::string &command ); virtual void runCommand( const std::string &command, const std::list< RefCount< ArgClass > > &args ); virtual void registerCommand( const std::string &command, - const RefCount< GenericCallback< void > > &callback ); + std::function< void (void) > callback ); virtual void registerCommand( const std::string &command, - const RefCount< GenericCallbackArg< void, const std::list< RefCount< ArgClass > > & > > &callback ); + const std::function< void ( const std::list< RefCount< ArgClass > > ) > callback ); virtual void runCommandWithStrArgs( const std::string &command_str ); virtual bool pathsChanged( const std::set< std::string > changed_paths ); @@ -103,8 +104,8 @@ static const char *type; private: - std::map< std::string, RefCount< GenericCallback< void > > > m_commands; - std::map< std::string, RefCount< GenericCallbackArg< void, const std::list< RefCount< ArgClass > > & > > > m_commands_with_args; + std::map< std::string, std::function< void( void ) > > m_commands; + std::map< std::string, std::function< void ( const std::list< RefCount< ArgClass > > ) > > m_commands_with_args; }; #endif diff -Nru worker-3.14.0/src/Makefile.am worker-3.15.4/src/Makefile.am --- worker-3.14.0/src/Makefile.am 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/Makefile.am 2019-01-28 21:40:22.000000000 +0000 @@ -221,7 +221,6 @@ menutreenode.hh \ menutreeui.cc \ menutreeui.hh \ - method_callback.hh \ modifytabsop.cc \ modifytabsop.hh \ mounttable.cc \ @@ -258,6 +257,8 @@ nwc_fsentry.hh \ nwc_os.cc \ nwc_os.hh \ + nwc_os_makedirs.cc \ + nwc_os_makedirs.hh \ nwc_path.cc \ nwc_path.hh \ nwc_virtualdir.cc \ @@ -266,6 +267,8 @@ nwcentryselectionstate.hh \ opencontextmenuop.cc \ opencontextmenuop.hh \ + opentabmenuop.cc \ + opentabmenuop.hh \ openworkermenuop.cc \ openworkermenuop.hh \ ownop.cc \ @@ -489,8 +492,12 @@ EXTRA_DIST = exprfilter_scanner.rl ajson_scan.rl +# patch the ragel output to fixed unsigned char issue but use sed +# instead of patch to silently skip this if future versions have +# different output. exprfilter_scanner.cc: exprfilter_scanner.rl ragel $< -o $@ + sed -i "s/const char _expr_parser_trans_cond_spaces/const signed char _expr_parser_trans_cond_spaces/" $@ ajson_scan.cc: ajson_scan.rl ragel $< -o $@ diff -Nru worker-3.14.0/src/Makefile.in worker-3.15.4/src/Makefile.in --- worker-3.14.0/src/Makefile.in 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/src/Makefile.in 2019-01-28 21:41:03.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -87,10 +97,6 @@ @USE_TESTS_TRUE@check_PROGRAMS = check_nwc_path$(EXEEXT) \ @USE_TESTS_TRUE@ check_ajson$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - bookmarkdb_scanner.cc configparser.hh configparser.cc \ - configscanner.cc $(top_srcdir)/depcomp $(top_srcdir)/ylwrap \ - $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ $(top_srcdir)/m4/ax_gcc_option.m4 \ @@ -103,6 +109,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/aguix/aguixconfig.h CONFIG_CLEAN_FILES = @@ -184,8 +191,9 @@ nmspecialsourceext.$(OBJEXT) nooperationop.$(OBJEXT) \ normalmode_requests.$(OBJEXT) normalops.$(OBJEXT) \ nwc_dir.$(OBJEXT) nwc_file.$(OBJEXT) nwc_fsentry.$(OBJEXT) \ - nwc_os.$(OBJEXT) nwc_path.$(OBJEXT) nwc_virtualdir.$(OBJEXT) \ - nwcentryselectionstate.$(OBJEXT) opencontextmenuop.$(OBJEXT) \ + nwc_os.$(OBJEXT) nwc_os_makedirs.$(OBJEXT) nwc_path.$(OBJEXT) \ + nwc_virtualdir.$(OBJEXT) nwcentryselectionstate.$(OBJEXT) \ + opencontextmenuop.$(OBJEXT) opentabmenuop.$(OBJEXT) \ openworkermenuop.$(OBJEXT) ownop.$(OBJEXT) panel.$(OBJEXT) \ parentactionop.$(OBJEXT) partspace.$(OBJEXT) \ pathjumpop.$(OBJEXT) pathjumpui.$(OBJEXT) \ @@ -557,6 +565,10 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver $(top_srcdir)/ylwrap \ + bookmarkdb_scanner.cc configparser.cc configparser.hh \ + configscanner.cc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -636,6 +648,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ @@ -947,7 +960,6 @@ menutreenode.hh \ menutreeui.cc \ menutreeui.hh \ - method_callback.hh \ modifytabsop.cc \ modifytabsop.hh \ mounttable.cc \ @@ -984,6 +996,8 @@ nwc_fsentry.hh \ nwc_os.cc \ nwc_os.hh \ + nwc_os_makedirs.cc \ + nwc_os_makedirs.hh \ nwc_path.cc \ nwc_path.hh \ nwc_virtualdir.cc \ @@ -992,6 +1006,8 @@ nwcentryselectionstate.hh \ opencontextmenuop.cc \ opencontextmenuop.hh \ + opentabmenuop.cc \ + opentabmenuop.hh \ openworkermenuop.cc \ openworkermenuop.hh \ ownop.cc \ @@ -1236,7 +1252,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1453,11 +1468,13 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwc_file.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwc_fsentry.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwc_os.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwc_os_makedirs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwc_path.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwc_path_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwc_virtualdir.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwcentryselectionstate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opencontextmenuop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opentabmenuop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openworkermenuop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ownop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel.Po@am__quote@ @@ -1729,7 +1746,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2064,9 +2081,15 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS +.PRECIOUS: Makefile + +# patch the ragel output to fixed unsigned char issue but use sed +# instead of patch to silently skip this if future versions have +# different output. exprfilter_scanner.cc: exprfilter_scanner.rl ragel $< -o $@ + sed -i "s/const char _expr_parser_trans_cond_spaces/const signed char _expr_parser_trans_cond_spaces/" $@ ajson_scan.cc: ajson_scan.rl ragel $< -o $@ diff -Nru worker-3.14.0/src/method_callback.hh worker-3.15.4/src/method_callback.hh --- worker-3.14.0/src/method_callback.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/method_callback.hh 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -/* method_callback.hh - * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2011 Ralf Hoffmann. - * You can contact me at: ralf@boomerangsworld.de - * or http://www.boomerangsworld.de/worker - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef METHOD_CALLBACK_HH -#define METHOD_CALLBACK_HH - -#include "wdefines.h" -#include "generic_callback.hh" - -template< typename X, void (X::*method)() > -class MethodCallback : public GenericCallback -{ -public: - MethodCallback( X* object ) : m_object( object ) - {} - - void callback() - { - if ( m_object != NULL ) { - ( m_object->*method )(); - } - } -private: - X* m_object; -}; - -template< typename X, typename Y, void (X::*method)( Y ) > -class MethodCallbackArg : public GenericCallbackArg -{ -public: - MethodCallbackArg( X* object ) : m_object( object ) - {} - - void callback( Y y ) - { - if ( m_object != NULL ) { - ( m_object->*method )( y ); - } - } -private: - X* m_object; -}; - -#endif diff -Nru worker-3.14.0/src/modifytabsop.cc worker-3.15.4/src/modifytabsop.cc --- worker-3.14.0/src/modifytabsop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/modifytabsop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* modifytabsop.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2009-2014 Ralf Hoffmann. + * Copyright (C) 2009-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -99,6 +99,15 @@ case PREV_TAB: fh->configPutPair( "tabaction", "prevtab" ); break; + case TOGGLE_LOCK_STATE: + fh->configPutPair( "tabaction", "togglelockstate" ); + break; + case MOVE_TAB_LEFT: + fh->configPutPair( "tabaction", "movetableft" ); + break; + case MOVE_TAB_RIGHT: + fh->configPutPair( "tabaction", "movetabright" ); + break; default: fh->configPutPair( "tabaction", "newtab" ); break; @@ -133,6 +142,17 @@ args.push_back( new IntArg( -1 ) ); lm1->runCommand( "switch_to_tab_direction", args ); break; + case TOGGLE_LOCK_STATE: + lm1->runCommand( "toggle_lock_current_tab" ); + break; + case MOVE_TAB_LEFT: + args.push_back( new IntArg( -1 ) ); + lm1->runCommand( "move_tab_direction", args ); + break; + case MOVE_TAB_RIGHT: + args.push_back( new IntArg( 1 ) ); + lm1->runCommand( "move_tab_direction", args ); + break; default: lm1->runCommand( "new_tab" ); break; @@ -173,6 +193,9 @@ rcyb->addOption( catalog.getLocale( 853 ) ); rcyb->addOption( catalog.getLocale( 854 ) ); rcyb->addOption( catalog.getLocale( 855 ) ); + rcyb->addOption( catalog.getLocale( 1212 ) ); + rcyb->addOption( catalog.getLocale( 1215 ) ); + rcyb->addOption( catalog.getLocale( 1216 ) ); rcyb->resize( rcyb->getMaxSize(), rcyb->getHeight() ); ac1_1->readLimits(); switch ( m_tab_action ) { @@ -185,6 +208,15 @@ case PREV_TAB: rcyb->setOption( 3 ); break; + case TOGGLE_LOCK_STATE: + rcyb->setOption( 4 ); + break; + case MOVE_TAB_LEFT: + rcyb->setOption( 5 ); + break; + case MOVE_TAB_RIGHT: + rcyb->setOption( 6 ); + break; default: rcyb->setOption( 0 ); break; @@ -237,6 +269,15 @@ case 3: m_tab_action = PREV_TAB; break; + case 4: + m_tab_action = TOGGLE_LOCK_STATE; + break; + case 5: + m_tab_action = MOVE_TAB_LEFT; + break; + case 6: + m_tab_action = MOVE_TAB_RIGHT; + break; default: m_tab_action = NEW_TAB; break; diff -Nru worker-3.14.0/src/modifytabsop.hh worker-3.15.4/src/modifytabsop.hh --- worker-3.14.0/src/modifytabsop.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/modifytabsop.hh 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* modifytabsop.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2009 Ralf Hoffmann. + * Copyright (C) 2009-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -49,7 +49,10 @@ NEW_TAB = 0, CLOSE_CURRENT_TAB, NEXT_TAB, - PREV_TAB + PREV_TAB, + TOGGLE_LOCK_STATE, + MOVE_TAB_LEFT, + MOVE_TAB_RIGHT } modify_tab_t; void setTabAction( modify_tab_t a ); diff -Nru worker-3.14.0/src/nwcentryselectionstate.cc worker-3.15.4/src/nwcentryselectionstate.cc --- worker-3.14.0/src/nwcentryselectionstate.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/nwcentryselectionstate.cc 2019-01-28 21:40:22.000000000 +0000 @@ -192,6 +192,10 @@ comp = StringComparator::compare( fse1->getFullname(), fse2->getFullname() ); break; + case SORT_STRICT_NAME: + comp = strcmp( fse1->getFullname().c_str(), + fse2->getFullname().c_str() ); + break; case SORT_SIZE: s1 = -1; s2 = -1; diff -Nru worker-3.14.0/src/nwc_os.cc worker-3.15.4/src/nwc_os.cc --- worker-3.14.0/src/nwc_os.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/nwc_os.cc 2019-01-28 21:40:22.000000000 +0000 @@ -164,34 +164,5 @@ return buf; } - int make_dirs( const std::string &dirname ) - { - NWC::FSEntry fse( dirname ); - - if ( fse.entryExists() ) { - if ( fse.isDir( true ) ) { - // nothing to do - return 0; - } - - return -EEXIST; - } - - std::string parent_dirname = fse.getDirname(); - - if ( parent_dirname != "" && - parent_dirname != "." ) { - int res = make_dirs( parent_dirname ); - - if ( res != 0 ) { - return res; - } - } - - int res = worker_mkdir( dirname.c_str(), 0777 ); - - return res; - } - } } diff -Nru worker-3.14.0/src/nwc_os.hh worker-3.15.4/src/nwc_os.hh --- worker-3.14.0/src/nwc_os.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/nwc_os.hh 2019-01-28 21:40:22.000000000 +0000 @@ -34,8 +34,6 @@ char *resolveEnv( const char* ); char *getLinkTarget( const char *symlink ); - - int make_dirs( const std::string &dirname ); } } diff -Nru worker-3.14.0/src/nwc_os_makedirs.cc worker-3.15.4/src/nwc_os_makedirs.cc --- worker-3.14.0/src/nwc_os_makedirs.cc 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/src/nwc_os_makedirs.cc 2019-01-28 21:40:22.000000000 +0000 @@ -0,0 +1,153 @@ +/* nwc_os_makedirs.cc + * This file belongs to Worker, a file manager for UN*X/X11. + * Copyright (C) 2017 Ralf Hoffmann. + * You can contact me at: ralf@boomerangsworld.de + * or http://www.boomerangsworld.de/worker + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "nwc_os_makedirs.hh" +#include +#include +#include "nwc_fsentry.hh" +#include "nwc_path.hh" + +namespace NWC { + namespace OS { + int prepare_deep_dir_info( const std::string &base_dir, + const std::string &sub_segments, + std::vector< deep_dir_info > &segments ) + { + int res = 0; + std::vector< std::string > path_components; + std::string path = base_dir; + + segments.clear(); + + AGUIXUtils::split_string( path_components, sub_segments, '/' ); + + for ( auto &segment : path_components ) { + if ( segment.empty() ) continue; + + path = NWC::Path::join( path, segment ); + + NWC::FSEntry fe( path ); + + if ( ! fe.entryExists() || + ! fe.isDir( true ) ) { + res = -EINVAL; + break; + } + + mode_t mode; + uid_t user; + gid_t group; + + if ( fe.isLink() ) { + mode = fe.stat_dest_mode(); + user = fe.stat_dest_userid(); + group = fe.stat_dest_groupid(); + } else { + mode = fe.stat_mode(); + user = fe.stat_userid(); + group = fe.stat_groupid(); + } + + deep_dir_info ddi( segment, + mode, + user, + group ); + + segments.push_back( ddi ); + } + + return res; + } + + int make_dirs( const std::string &base_dir, + std::vector< deep_dir_info > &segments, + bool post_run ) + { + std::string path = base_dir; + int res = 0; + + for ( auto &s : segments ) { + if ( s.get_segment_name().empty() ) continue; + + path = NWC::Path::join( path, s.get_segment_name() ); + + if ( post_run ) { + if ( s.was_created() ) { + // need to apply correct permissions + worker_chown( path.c_str(), + s.get_user(), + s.get_group() ); + worker_chmod( path.c_str(), s.get_mode() ); + } + } else { + NWC::FSEntry fe( path ); + + if ( fe.entryExists() ) { + if ( fe.isDir( true ) ) { + continue; + } + + res = -EEXIST; + break; + } + + res = worker_mkdir( path.c_str(), 0700 ); + if ( res != 0 ) { + break; + } + s.set_was_created( true ); + } + } + + return res; + } + + int make_dirs( const std::string &dirname ) + { + NWC::FSEntry fse( dirname ); + + if ( fse.entryExists() ) { + if ( fse.isDir( true ) ) { + // nothing to do + return 0; + } + + return -EEXIST; + } + + std::string parent_dirname = fse.getDirname(); + + if ( parent_dirname != "" && + parent_dirname != "." ) { + int res = make_dirs( parent_dirname ); + + if ( res != 0 ) { + return res; + } + } + + int res = worker_mkdir( dirname.c_str(), 0700 ); + + return res; + } + + } +} diff -Nru worker-3.14.0/src/nwc_os_makedirs.hh worker-3.15.4/src/nwc_os_makedirs.hh --- worker-3.14.0/src/nwc_os_makedirs.hh 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/src/nwc_os_makedirs.hh 2019-01-28 21:40:22.000000000 +0000 @@ -0,0 +1,95 @@ +/* nwc_os_makedirs.hh + * This file belongs to Worker, a file manager for UN*X/X11. + * Copyright (C) 2017 Ralf Hoffmann. + * You can contact me at: ralf@boomerangsworld.de + * or http://www.boomerangsworld.de/worker + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef NWC_OS_MAKEDIRS_HH +#define NWC_OS_MAKEDIRS_HH + +#include "wdefines.h" + +#include +#include + +namespace NWC +{ + namespace OS { + + class deep_dir_info { + public: + deep_dir_info( const std::string &segment_name, + mode_t mode, + uid_t user, + gid_t group ) : m_segment_name( segment_name ), + m_mode( mode ), + m_user( user ), + m_group( group ), + m_was_created( false ) + {} + + const std::string &get_segment_name() const + { + return m_segment_name; + } + + mode_t get_mode() const + { + return m_mode; + } + + uid_t get_user() const + { + return m_user; + } + + gid_t get_group() const + { + return m_group; + } + + bool was_created() const + { + return m_was_created; + } + + void set_was_created( bool val ) + { + m_was_created = val; + } + private: + std::string m_segment_name; + mode_t m_mode; + uid_t m_user; + gid_t m_group; + bool m_was_created; + }; + + int prepare_deep_dir_info( const std::string &base_dir, + const std::string &sub_segments, + std::vector< deep_dir_info > &segments ); + + int make_dirs( const std::string &base_dir, + std::vector< deep_dir_info > &segments, + bool post_run ); + + int make_dirs( const std::string &dirname ); + } +} + +#endif diff -Nru worker-3.14.0/src/opentabmenuop.cc worker-3.15.4/src/opentabmenuop.cc --- worker-3.14.0/src/opentabmenuop.cc 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/src/opentabmenuop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -0,0 +1,74 @@ +/* opentabmenuop.cc + * This file belongs to Worker, a file manager for UN*X/X11. + * Copyright (C) 2018 Ralf Hoffmann. + * You can contact me at: ralf@boomerangsworld.de + * or http://www.boomerangsworld.de/worker + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "opentabmenuop.hh" +#include "listermode.h" +#include "worker_locale.h" +#include "worker.h" + +const char *OpenTabMenuOp::name = "OpenTabMenuOp"; + +OpenTabMenuOp::OpenTabMenuOp() : FunctionProto() +{ +} + +OpenTabMenuOp::~OpenTabMenuOp() +{ +} + +OpenTabMenuOp *OpenTabMenuOp::duplicate() const +{ + OpenTabMenuOp *ta = new OpenTabMenuOp(); + return ta; +} + +bool OpenTabMenuOp::isName(const char *str) +{ + if ( strcmp( str, name ) == 0 ) + return true; + else + return false; +} + +const char *OpenTabMenuOp::getName() +{ + return name; +} + +int OpenTabMenuOp::run( WPUContext *wpu, ActionMessage *msg ) +{ + ListerMode *lm1; + if ( msg->mode != msg->AM_MODE_DNDACTION ) { + Lister *l1 = msg->getWorker()->getActiveLister(); + if ( l1 != NULL ) { + lm1 = l1->getActiveMode(); + if ( lm1 != NULL ) { + lm1->runCommand( "open_current_tab_menu" ); + } + } + } + return 0; +} + +const char *OpenTabMenuOp::getDescription() +{ + return catalog.getLocaleCom( 69 ); +} diff -Nru worker-3.14.0/src/opentabmenuop.hh worker-3.15.4/src/opentabmenuop.hh --- worker-3.14.0/src/opentabmenuop.hh 1970-01-01 00:00:00.000000000 +0000 +++ worker-3.15.4/src/opentabmenuop.hh 2019-01-28 21:40:22.000000000 +0000 @@ -0,0 +1,47 @@ +/* opentabmenuop.hh + * This file belongs to Worker, a file manager for UN*X/X11. + * Copyright (C) 2018 Ralf Hoffmann. + * You can contact me at: ralf@boomerangsworld.de + * or http://www.boomerangsworld.de/worker + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef OPENTABMENUOP_HH +#define OPENTABMENUOP_HH + +#include "wdefines.h" +#include "functionproto.h" + +class OpenTabMenuOp : public FunctionProto +{ +public: + OpenTabMenuOp(); + ~OpenTabMenuOp(); + OpenTabMenuOp( const OpenTabMenuOp &other ); + OpenTabMenuOp &operator=( const OpenTabMenuOp &other ); + + OpenTabMenuOp *duplicate() const; + virtual bool isName(const char *); + virtual const char *getName(); + + using FunctionProto::run; + int run( WPUContext*, ActionMessage* ); + virtual const char *getDescription(); + + static const char *name; +}; + +#endif diff -Nru worker-3.14.0/src/setfilterop.cc worker-3.15.4/src/setfilterop.cc --- worker-3.14.0/src/setfilterop.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/setfilterop.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1011,3 +1011,13 @@ m_popup_menu = NULL; } } + +bool SetFilterOp::isInteractiveRun() const +{ + return true; +} + +void SetFilterOp::setInteractiveRun() +{ + request_flags = true; +} diff -Nru worker-3.14.0/src/setfilterop.h worker-3.15.4/src/setfilterop.h --- worker-3.14.0/src/setfilterop.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/setfilterop.h 2019-01-28 21:40:22.000000000 +0000 @@ -74,6 +74,9 @@ void popupCallback( AGMessage *msg ); static std::list< std::string > getHistory(); + + bool isInteractiveRun() const; + void setInteractiveRun(); protected: static const char *name; // Infos to save diff -Nru worker-3.14.0/src/stringcomparator.cc worker-3.15.4/src/stringcomparator.cc --- worker-3.14.0/src/stringcomparator.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/stringcomparator.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* stringcomparator.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2011-2015 Ralf Hoffmann. + * Copyright (C) 2011-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -70,7 +70,11 @@ #ifdef HAVE_STRCASECMP if ( sm_use_mode == STRING_COMPARE_NOCASE ) { - return strcasecmp( s1, s2 ); + int res = strcasecmp( s1, s2 ); + + if ( res != 0 ) return res; + + // fall through to case sensitive comparison } #endif diff -Nru worker-3.14.0/src/textviewmode.cc worker-3.15.4/src/textviewmode.cc --- worker-3.14.0/src/textviewmode.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/textviewmode.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* textviewmode.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2011-2014 Ralf Hoffmann. + * Copyright (C) 2011-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -28,7 +28,6 @@ #include "fileentry.hh" #include "nmspecialsourceext.hh" #include "textstoragefile.h" -#include "method_callback.hh" const char *TextViewMode::type = "TextViewMode"; @@ -43,12 +42,12 @@ m_file_name_text = nullptr; m_file_percentage_text = nullptr; - registerCommand( "up", new MethodCallback( this ) ); - registerCommand( "down", new MethodCallback( this ) ); - registerCommand( "first", new MethodCallback( this ) ); - registerCommand( "last", new MethodCallback( this ) ); - registerCommand( "pageup", new MethodCallback( this ) ); - registerCommand( "pagedown", new MethodCallback( this ) ); + registerCommand( "up", [this]{ command_up(); } ); + registerCommand( "down", [this]{ command_down(); } ); + registerCommand( "first", [this]{ command_first(); } ); + registerCommand( "last", [this]{ command_last(); } ); + registerCommand( "pageup", [this]{ command_pageup(); } ); + registerCommand( "pagedown", [this]{ command_pagedown(); } ); } TextViewMode::~TextViewMode() diff -Nru worker-3.14.0/src/verzeichnis.cc worker-3.15.4/src/verzeichnis.cc --- worker-3.14.0/src/verzeichnis.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/verzeichnis.cc 2019-01-28 21:40:22.000000000 +0000 @@ -159,6 +159,9 @@ case SORT_NAME: comp = StringComparator::compare( fe1->name, fe2->name ); break; + case SORT_STRICT_NAME: + comp = strcmp( fe1->name, fe2->name ); + break; case SORT_SIZE: s1=-1; s2=-1; diff -Nru worker-3.14.0/src/verzeichnis.hh worker-3.15.4/src/verzeichnis.hh --- worker-3.14.0/src/verzeichnis.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/verzeichnis.hh 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* verzeichnis.hh * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2007,2010-2011 Ralf Hoffmann. + * Copyright (C) 2001-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -37,10 +37,11 @@ SORT_OWNER, SORT_INODE, SORT_NLINK, - SORT_PERMISSION }; + SORT_PERMISSION, + SORT_STRICT_NAME }; /* for checking valid sortmode */ -#define ISVALID_SORTMODE(sortmode) ( ( ( sortmode & 0xff ) >= SORT_NAME ) && ( ( sortmode & 0xff ) <= SORT_PERMISSION ) ) +#define ISVALID_SORTMODE(sortmode) ( ( ( sortmode & 0xff ) >= SORT_NAME ) && ( ( sortmode & 0xff ) <= SORT_STRICT_NAME ) ) /* high bits used for some flags ("or" them with sort mode)*/ #define SORT_REVERSE 256 diff -Nru worker-3.14.0/src/virtualdirmode.cc worker-3.15.4/src/virtualdirmode.cc --- worker-3.14.0/src/virtualdirmode.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/virtualdirmode.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* virtualdirmode.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2012-2017 Ralf Hoffmann. + * Copyright (C) 2012-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -31,7 +31,6 @@ #include "virtualdirmode.hh" #include "worker_locale.h" #include "worker.h" -#include "method_callback.hh" #include "nwc_file.hh" #include "dmcacheentrynwc.hh" #include "nwcentryselectionstate.hh" @@ -75,6 +74,7 @@ #include "chtimecore.hh" #include "setfilterop.h" #include "normalops.h" +#include const char *VirtualDirMode::type = "VirtualDirMode"; int VirtualDirMode::maxfilestrlen = 1; @@ -150,39 +150,37 @@ m_tabs_loaded( false ), m_use_custom_columns( false ) { - registerCommand( "up", new MethodCallback( this ) ); - registerCommand( "down", new MethodCallback( this ) ); - registerCommand( "first", new MethodCallback( this ) ); - registerCommand( "last", new MethodCallback( this ) ); - registerCommand( "pageup", new MethodCallback( this ) ); - registerCommand( "pagedown", new MethodCallback( this ) ); - registerCommand( "selectentry", new MethodCallback( this ) ); - registerCommand( "selectentry", new MethodCallbackArg > &, - &VirtualDirMode::command_selectentry>( this ) ); - registerCommand( "activate_path_input", new MethodCallback( this ) ); - registerCommand( "parentdir", new MethodCallback( this ) ); - registerCommand( "enter_dir", new MethodCallbackArg > &, - &VirtualDirMode::enter_dir>( this ) ); - registerCommand( "enter_active", new MethodCallback( this ) ); - registerCommand( "simulate_doubleclick", new MethodCallback( this ) ); - registerCommand( "new_tab", new MethodCallback( this ) ); - registerCommand( "close_current_tab", new MethodCallback( this ) ); - registerCommand( "open_label_popup", new MethodCallback( this ) ); - registerCommand( "activate_entry", new MethodCallbackArg > &, - &VirtualDirMode::activate_entry>( this ) ); - registerCommand( "show_cache_entry", new MethodCallbackArg > &, - &VirtualDirMode::show_cache_entry>( this ) ); - registerCommand( "selectall", new MethodCallback( this ) ); - registerCommand( "selectnone", new MethodCallback( this ) ); - registerCommand( "invertall", new MethodCallback( this ) ); - registerCommand( "switch_to_tab_direction", new MethodCallbackArg > &, - &VirtualDirMode::switch_to_tab_direction>( this ) ); - registerCommand( "recenter_top_bottom", new MethodCallback< VirtualDirMode, &VirtualDirMode::recenterTopBottom>( this ) ); - registerCommand( "flatten_dir", new MethodCallback< VirtualDirMode, &VirtualDirMode::flatten_dir_dont_follow_symlinks>( this ) ); - registerCommand( "flatten_dir_follow_symlinks", new MethodCallback< VirtualDirMode, &VirtualDirMode::flatten_dir_follow_symlinks>( this ) ); - registerCommand( "go_to_previous_dir", new MethodCallback< VirtualDirMode, &VirtualDirMode::go_to_previous_dir>( this ) ); - registerCommand( "vdir_from_selected", new MethodCallback< VirtualDirMode, &VirtualDirMode::vdir_from_selected>( this ) ); - registerCommand( "vdir_add_selected_from_other_side", new MethodCallback< VirtualDirMode, &VirtualDirMode::vdir_add_selected_from_other_side>( this ) ); + registerCommand( "up", [this]{ command_up(); } ); + registerCommand( "down", [this]{ command_down(); } ); + registerCommand( "first", [this]{ command_first(); } ); + registerCommand( "last", [this]{ command_last(); } ); + registerCommand( "pageup", [this]{ command_pageup(); } ); + registerCommand( "pagedown", [this]{ command_pagedown(); } ); + registerCommand( "selectentry", [this]{ command_selectentry(); } ); + registerCommand( "selectentry", [this]( const std::list< RefCount< ArgClass > > &a ) { command_selectentry( a ); } ); + registerCommand( "activate_path_input", [this]{ command_pathinput(); } ); + registerCommand( "parentdir", [this]{ command_parentdir(); } ); + registerCommand( "enter_dir", [this]( const std::list< RefCount< ArgClass > > &a ) { enter_dir( a ); } ); + registerCommand( "enter_active", [this]{ enter_active(); } ); + registerCommand( "simulate_doubleclick", [this]{ command_simdd(); } ); + registerCommand( "new_tab", [this]{ newTab(); } ); + registerCommand( "close_current_tab", [this]{ closeCurrentTab(); } ); + registerCommand( "toggle_lock_current_tab", [this]{ toggleLockCurrentTab(); } ); + registerCommand( "open_current_tab_menu", [this]{ open_current_tab_menu(); } ); + registerCommand( "open_label_popup", [this]{ openLabelPopUp(); } ); + registerCommand( "activate_entry", [this]( const std::list< RefCount< ArgClass > > &a ) { activate_entry( a ); } ); + registerCommand( "show_cache_entry", [this]( const std::list< RefCount< ArgClass > > &a ) { show_cache_entry( a ); } ); + registerCommand( "selectall", [this]{ command_selectall(); } ); + registerCommand( "selectnone", [this]{ command_selectnone(); } ); + registerCommand( "invertall", [this]{ command_invertall(); } ); + registerCommand( "switch_to_tab_direction", [this]( const std::list< RefCount< ArgClass > > &a ) { switch_to_tab_direction( a ); } ); + registerCommand( "move_tab_direction", [this]( const std::list< RefCount< ArgClass > > &a ) { move_tab_direction( a ); } ); + registerCommand( "recenter_top_bottom", [this]{ recenterTopBottom(); } ); + registerCommand( "flatten_dir", [this]{ flatten_dir( false ); } ); + registerCommand( "flatten_dir_follow_symlinks", [this]{ flatten_dir( true ); } ); + registerCommand( "go_to_previous_dir", [this]{ go_to_previous_dir(); } ); + registerCommand( "vdir_from_selected", [this]{ vdir_from_selected(); } ); + registerCommand( "vdir_add_selected_from_other_side", [this]{ vdir_add_selected_from_other_side(); } ); m_shrinker = RefCount< TextShrinker >( new HalfShrinker() ); @@ -2980,12 +2978,12 @@ { if ( pos < 0 || pos >= (int)m_tab_store.tab_entries.size() ) return; - if ( ! m_tab_store.tab_entries[pos].first.get() ) return; + if ( ! m_tab_store.tab_entries[pos].ce.get() ) return; - std::string p = m_tab_store.tab_entries[pos].first->getCommonPrefix(); + std::string p = m_tab_store.tab_entries[pos].ce->getCommonPrefix(); if ( p.empty() ) { - p = m_tab_store.tab_entries[pos].first->getNameOfDir(); + p = m_tab_store.tab_entries[pos].ce->getNameOfDir(); } if ( p.length() > 1 && AGUIXUtils::ends_with( p, "/" ) ) { @@ -2995,7 +2993,11 @@ std::string p2 = NWC::Path::basename( p ); if ( p2.empty() ) p2 = p; - + + if ( m_tab_store.tab_entries[pos].locked ) { + p2 = "(" + p2 + ")"; + } + m_tab_b->setOption( pos, p2.c_str() ); } @@ -3031,7 +3033,7 @@ { if ( m_tab_store.active_tab < 0 || m_tab_store.active_tab >= (int)m_tab_store.tab_entries.size() ) return; - std::string current_breadcrumb_path = m_tab_store.tab_entries.at( m_tab_store.active_tab ).second; + std::string current_breadcrumb_path = m_tab_store.tab_entries.at( m_tab_store.active_tab ).path; m_tab_store.tab_entries.push_back( { ce, current_breadcrumb_path } ); @@ -3058,6 +3060,8 @@ if ( m_tab_store.tab_entries.size() < 2 ) return; + if ( m_tab_store.tab_entries[ tab ].locked ) return; + auto it = m_tab_store.tab_entries.begin(); for ( int a = tab; a > 0; a--, it++ ); @@ -3069,9 +3073,9 @@ } if ( m_tab_store.active_tab >= 0 ) { - m_tab_store.tab_entries[ m_tab_store.active_tab ].first->reload(); + m_tab_store.tab_entries[ m_tab_store.active_tab ].ce->reload(); - setCurrentCE( m_tab_store.tab_entries[ m_tab_store.active_tab ].first ); + setCurrentCE( m_tab_store.tab_entries[ m_tab_store.active_tab ].ce ); } else { setCurrentCE( NULL ); } @@ -3079,22 +3083,54 @@ updateTabs( true ); } +void VirtualDirMode::lockTab( int tab ) +{ + if ( tab < 0 || tab >= (int)m_tab_store.tab_entries.size() ) return; + + m_tab_store.tab_entries[ tab ].locked = true; + + updateTabs( true ); +} + +void VirtualDirMode::unlockTab( int tab ) +{ + if ( tab < 0 || tab >= (int)m_tab_store.tab_entries.size() ) return; + + m_tab_store.tab_entries[ tab ].locked = false; + + updateTabs( true ); +} + +void VirtualDirMode::toggleLockTab( int tab ) +{ + if ( tab < 0 || tab >= (int)m_tab_store.tab_entries.size() ) return; + + m_tab_store.tab_entries[ tab ].locked = ! m_tab_store.tab_entries[ tab ].locked; + + updateTabs( true ); +} + +void VirtualDirMode::toggleLockCurrentTab() +{ + toggleLockTab( m_tab_store.active_tab ); +} + void VirtualDirMode::switchToTab( int tab ) { if ( tab < 0 || tab >= (int)m_tab_store.tab_entries.size() ) return; - if ( ! m_tab_store.tab_entries[ tab ].first.get() ) return; + if ( ! m_tab_store.tab_entries[ tab ].ce.get() ) return; m_tab_store.active_tab = tab; - m_tab_store.tab_entries[ tab ].first->reload(); + m_tab_store.tab_entries[ tab ].ce->reload(); // this is to apply previous deepest path to breadcrumb // actual path will be set by setCurrentCE m_breadcrumb.current_path_components.clear(); - update_breadcrumb( m_tab_store.tab_entries[ tab ].second, true ); + update_breadcrumb( m_tab_store.tab_entries[ tab ].path, true ); - setCurrentCE( m_tab_store.tab_entries[ tab ].first ); + setCurrentCE( m_tab_store.tab_entries[ tab ].ce ); } void VirtualDirMode::switchToTabDirection( int direction ) @@ -3109,6 +3145,39 @@ switchToTab( tab ); } +void VirtualDirMode::moveTabDirection( int direction ) +{ + if ( m_tab_store.active_tab < 0 || + m_tab_store.active_tab >= (int)m_tab_store.tab_entries.size() ) { + return; + } + + int tab = m_tab_b->getSelectedOption() + direction; + + for (;;) { + if ( tab < 0 || + tab >= (int)m_tab_store.tab_entries.size() ) { + break; + } + + if ( m_tab_store.tab_entries[ tab ].locked ) { + tab += direction; + continue; + } + + // got a valid new tab position so swap current tab and new tab + + std::swap( m_tab_store.tab_entries[ m_tab_store.active_tab ], + m_tab_store.tab_entries[ tab ] ); + + m_tab_store.active_tab = tab; + + updateTabs( true ); + + break; + } +} + void VirtualDirMode::updateCE() { if ( ! ce.get() ) return; @@ -3582,7 +3651,7 @@ m_tab_store.tab_entries.resize( m_tab_store.active_tab + 1 ); } - m_tab_store.tab_entries[m_tab_store.active_tab].first = ce; + m_tab_store.tab_entries[m_tab_store.active_tab].ce = ce; if ( ce->getActiveEntryPos() < 0 ) { @@ -5606,11 +5675,13 @@ } } -std::list VirtualDirMode::buildTabPopUpData() +std::list VirtualDirMode::buildTabPopUpData( int tab ) { int descr_id = 0; std::list m1; + if ( tab < 0 || tab >= (int)m_tab_store.tab_entries.size() ) return m1; + PopUpMenu::PopUpEntry e1; // e1.name = "Tab menu"; // e1.type = PopUpMenu::HEADER; @@ -5655,7 +5726,44 @@ m_current_popup_settings.tab_id_to_action[e1.id] = tab_popup_table_t( tab_popup_table_t::TAB_TO_OTHER_SIDE_AS_NEW ); m1.push_back( e1 ); + + e1.type = PopUpMenu::HLINE; + m1.push_back( e1 ); + + e1.type = PopUpMenu::NORMAL; + e1.id = descr_id++; + + if ( ! m_tab_store.tab_entries[tab].locked ) { + e1.name = catalog.getLocale( 1213 ); + + m_current_popup_settings.tab_id_to_action[e1.id] = tab_popup_table_t( tab_popup_table_t::LOCK_TAB ); + } else { + e1.name = catalog.getLocale( 1214 ); + + m_current_popup_settings.tab_id_to_action[e1.id] = tab_popup_table_t( tab_popup_table_t::UNLOCK_TAB ); + } + + m1.push_back( e1 ); + + e1.type = PopUpMenu::HLINE; + m1.push_back( e1 ); + + e1.type = PopUpMenu::NORMAL; + e1.name = catalog.getLocale( 1215 ); + e1.id = descr_id++; + + m_current_popup_settings.tab_id_to_action[e1.id] = tab_popup_table_t( tab_popup_table_t::MOVE_TAB_LEFT ); + + m1.push_back( e1 ); + + e1.type = PopUpMenu::NORMAL; + e1.name = catalog.getLocale( 1216 ); + e1.id = descr_id++; + + m_current_popup_settings.tab_id_to_action[e1.id] = tab_popup_table_t( tab_popup_table_t::MOVE_TAB_RIGHT ); + m1.push_back( e1 ); + return m1; } @@ -5665,7 +5773,7 @@ m_current_popup_settings.reset(); - std::list tabmenu = buildTabPopUpData(); + std::list tabmenu = buildTabPopUpData( tab ); m_current_popup_settings.tab_popup_menu = std::unique_ptr( new PopUpMenu( aguix, tabmenu ) ); m_current_popup_settings.tab_popup_menu->create(); @@ -5678,6 +5786,11 @@ m_current_popup_settings.reset(); } +void VirtualDirMode::open_current_tab_menu() +{ + openTabPopUp( m_tab_store.active_tab ); +} + VirtualDirMode::PopUpSettings::PopUpSettings() : label_menu_id( -1 ), lv_popup_menu( NULL ), m_tab( -1 ), @@ -5730,9 +5843,9 @@ m_current_popup_settings.m_tab < (int)m_tab_store.tab_entries.size() ) { auto tce = m_tab_store.tab_entries[m_current_popup_settings.m_tab]; - if ( tce.first.get() ) { - if ( tce.first->isRealDir() ) { - std::string dir = tce.first->getNameOfDir(); + if ( tce.ce.get() ) { + if ( tce.ce->isRealDir() ) { + std::string dir = tce.ce->getNameOfDir(); if ( ! dir.empty() ) { Lister *l2; @@ -5765,7 +5878,7 @@ lm1->runCommand( "new_tab" ); } - auto d = tce.first->getNWCDir(); + auto d = tce.ce->getNWCDir(); if ( d ) { vdm->showDir( *d ); @@ -5774,6 +5887,14 @@ } } } + } else if ( it1->second.type == tab_popup_table_t::LOCK_TAB ) { + lockTab( m_current_popup_settings.m_tab ); + } else if ( it1->second.type == tab_popup_table_t::UNLOCK_TAB ) { + unlockTab( m_current_popup_settings.m_tab ); + } else if ( it1->second.type == tab_popup_table_t::MOVE_TAB_LEFT ) { + moveTabDirection( -1 ); + } else if ( it1->second.type == tab_popup_table_t::MOVE_TAB_RIGHT ) { + moveTabDirection( 1 ); } } } @@ -6768,6 +6889,19 @@ } } +void VirtualDirMode::move_tab_direction( const std::list< RefCount< ArgClass > > &args ) +{ + if ( ! args.empty() ) { + RefCount< ArgClass > a1 = args.front(); + if ( a1.getVal() != NULL ) { + IntArg *a2 = dynamic_cast< IntArg *>( a1.getVal() ); + if ( a2 != NULL ) { + moveTabDirection( a2->getValue() ); + } + } + } +} + void VirtualDirMode::scrollListView( int dir ) { m_lv->setXOffset( m_lv->getXOffset() + dir * m_lv->getHScrollStep() ); @@ -8275,16 +8409,6 @@ std::unique_ptr &m_res; }; -void VirtualDirMode::flatten_dir_follow_symlinks() -{ - flatten_dir( true ); -} - -void VirtualDirMode::flatten_dir_dont_follow_symlinks() -{ - flatten_dir( false ); -} - void VirtualDirMode::flatten_dir( bool follow_symlinks ) { if ( ! ce.get() ) return; @@ -8416,7 +8540,7 @@ if ( i != components.size() ) { m_breadcrumb.current_path_components = components; - m_tab_store.tab_entries.at( m_tab_store.active_tab ).second = path; + m_tab_store.tab_entries.at( m_tab_store.active_tab ).path = path; } if ( components.size() > 0 ) { @@ -8794,8 +8918,8 @@ ofile << m_tab_store.active_tab << std::endl; for ( auto &it : m_tab_store.tab_entries ) { - if ( it.first.get() && it.first->isRealDir() ) { - std::string p = it.first->getNameOfDir(); + if ( it.ce.get() && it.ce->isRealDir() ) { + std::string p = it.ce->getNameOfDir(); ofile << p << std::endl; } @@ -9209,8 +9333,8 @@ std::vector< std::string > res; for ( auto &it : m_tab_store.tab_entries ) { - if ( it.first.get() && it.first->isRealDir() ) { - std::string p = it.first->getNameOfDir(); + if ( it.ce.get() && it.ce->isRealDir() ) { + std::string p = it.ce->getNameOfDir(); res.push_back( p ); } diff -Nru worker-3.14.0/src/virtualdirmode_copy.cc worker-3.15.4/src/virtualdirmode_copy.cc --- worker-3.14.0/src/virtualdirmode_copy.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/virtualdirmode_copy.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* virtualdirmode_copy.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2013-2015 Ralf Hoffmann. + * Copyright (C) 2013-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -31,7 +31,7 @@ #include "nmcopyopdir.hh" #include "nwc_path.hh" #include "copystate.hh" -#include +#include "nwc_os_makedirs.hh" const static int BGCOPY_UPDATE_TIMEOUT ( 1000 / 25 ); @@ -127,6 +127,8 @@ { std::list< NM_specialsourceExt > copylist; + std::string source_base_dir; + switch ( co->source ) { case copyorder::COPY_SPECIAL: copySourceList( co->sources, @@ -134,16 +136,48 @@ break; case copyorder::COPY_ONLYACTIVE: getSelFiles( copylist, LM_GETFILES_ONLYACTIVE, false ); + if ( ! currentDirIsReal() ) { + source_base_dir = getCurrentDirectory(); + } break; default: // all selected entries getSelFiles( copylist, LM_GETFILES_SELORACT, false ); + if ( ! currentDirIsReal() ) { + source_base_dir = getCurrentDirectory(); + } break; } for ( auto &it : copylist ) { if ( ! it.entry() ) continue; if ( check_for_bg_copy_collision( it.entry()->fullname, cs ) == false ) { - cc->registerFEToCopy( *it.entry(), it.getID() ); + std::vector< NWC::OS::deep_dir_info > file_base_segments; + + if ( co->vdir_preserve_dir_structure && + ! source_base_dir.empty() ) { + std::string file_base; + + file_base = NWC::Path::get_extended_basename( source_base_dir, + NWC::Path::dirname( it.entry()->fullname ) ); + + int res = NWC::OS::prepare_deep_dir_info( source_base_dir, + file_base, + file_base_segments ); + + if ( res != 0 ) { + std::string buttons = catalog.getLocale( 8 ); + + std::string text = AGUIXUtils::formatStringToString( catalog.getLocale( 1211 ), + it.entry()->fullname ); + + cowin->request( catalog.getLocale( 123 ), text.c_str(), buttons.c_str() ); + cc->setCancel( true ); + break; + } + } + + cc->registerFEToCopy( *it.entry(), it.getID(), + file_base_segments ); } else { cc->setCancel( true ); } diff -Nru worker-3.14.0/src/virtualdirmode.hh worker-3.15.4/src/virtualdirmode.hh --- worker-3.14.0/src/virtualdirmode.hh 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/virtualdirmode.hh 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* virtualdirmode.hh * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2012-2017 Ralf Hoffmann. + * Copyright (C) 2012-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -100,11 +100,11 @@ void command_invertall(); void show_cache_entry( const std::list< RefCount< ArgClass > > &args ); void switch_to_tab_direction( const std::list< RefCount< ArgClass > > &args ); + void move_tab_direction( const std::list< RefCount< ArgClass > > &args ); void flatten_dir( bool follow_symlinks ); - void flatten_dir_follow_symlinks(); - void flatten_dir_dont_follow_symlinks(); void vdir_from_selected(); void vdir_add_selected_from_other_side(); + void open_current_tab_menu(); void newTab(); @@ -242,6 +242,11 @@ void closeTab( int tab ); void switchToTab( int tab ); void switchToTabDirection( int direction ); + void lockTab( int tab ); + void unlockTab( int tab ); + void toggleLockTab( int tab ); + void toggleLockCurrentTab(); + void moveTabDirection( int direction ); void updateCE(); void showCacheState(); void updateName(); @@ -334,7 +339,7 @@ void setUpdatetime( int nv ); void updateSpaceTimeout( loff_t time_ms ); - std::list buildTabPopUpData(); + std::list buildTabPopUpData( int tab ); void handleTabPopUp( AGMessage *msg ); std::list buildLabelPopUpData( const NWCEntrySelectionState &es ); std::list buildFilterPopUpData( const NWCEntrySelectionState &es ); @@ -424,10 +429,16 @@ std::list< std::pair< std::string, RefCount< DMCacheEntryNWC > > > m_cache; + struct tab_info { + RefCount< DMCacheEntryNWC > ce; + std::string path; + bool locked; + }; + struct tab_store { tab_store() : active_tab( -1 ) {} - std::vector< std::pair< RefCount< DMCacheEntryNWC >, std::string > > tab_entries; + std::vector< struct tab_info > tab_entries; int active_tab; } m_tab_store; @@ -615,7 +626,15 @@ } label_popup_table_t; typedef struct _tab_popup_table_t { - typedef enum { NEW_TAB, DEL_TAB, TAB_TO_OTHER_SIDE, TAB_TO_OTHER_SIDE_AS_NEW } tab_popup_t; + typedef enum { NEW_TAB, + DEL_TAB, + TAB_TO_OTHER_SIDE, + TAB_TO_OTHER_SIDE_AS_NEW, + LOCK_TAB, + UNLOCK_TAB, + MOVE_TAB_LEFT, + MOVE_TAB_RIGHT + } tab_popup_t; _tab_popup_table_t() : type( NEW_TAB ) {} diff -Nru worker-3.14.0/src/worker.cc worker-3.15.4/src/worker.cc --- worker-3.14.0/src/worker.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/worker.cc 2019-01-28 21:40:22.000000000 +0000 @@ -5028,6 +5028,47 @@ } } } + + MenuTreeNode *commandsmenu = root->insertChild( catalog.getLocale( 245 ), "", "" ); + + std::vector< std::tuple< std::string, std::string, int, bool > > command_names; + + FunctionProto *tfpr; + for ( int i = 0; i < getNrOfCommands(); i++ ) { + tfpr = getCommand4ID( i ); + + command_names.push_back( std::make_tuple( tfpr->getName(), + tfpr->getDescription(), + i, + tfpr->isInteractiveRun() ) ); + delete tfpr; + } + + std::sort( command_names.begin(), + command_names.end(), []( const std::tuple< std::string, std::string, int, bool > &lhs, + const std::tuple< std::string, std::string, int, bool > &rhs ) { + return std::get<1>( lhs ) < std::get<1>( rhs ); + } ); + + for ( auto &op : command_names ) { + MenuTreeNode *e = commandsmenu->insertChild( std::get<1>( op ), + "", + "" ); + int id = std::get<2>( op ); + + e->setActivateFunction( [ this, id ]() { + activateCommandByID( id ); + } ); + + if ( std::get<3>( op ) ) { + MenuTreeNode *e = commandsmenu->insertChild( std::get<1>( op ) + " (interactive)", + "", + "" ); + e->setActivateFunction( [ this, id ]() { + activateCommandByID( id, true ); + } ); + } + } } void Worker::openCommandMenu( bool show_recently_used ) @@ -5477,3 +5518,24 @@ pushStatebarText( m_button_help_text ); } } + +void Worker::activateCommandByID( int id, bool interactive ) +{ + ActionMessage amsg( this ); + amsg.mode = amsg.AM_MODE_NORMAL; + + List *commandlist = new List(); + FunctionProto *op = getCommand4ID( id ); + if ( op ) { + if ( interactive && op->isInteractiveRun() ) { + op->setInteractiveRun(); + } + + commandlist->addElement( op ); + } + + interpret( commandlist, &amsg ); + + delete op; + delete commandlist; +} diff -Nru worker-3.14.0/src/worker_commands.cc worker-3.15.4/src/worker_commands.cc --- worker-3.14.0/src/worker_commands.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/worker_commands.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* worker_commands.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2017 Ralf Hoffmann. + * Copyright (C) 2001-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -232,6 +232,9 @@ case 68: fpr = new ExternalVDirOp(); break; + case 69: + fpr = new OpenTabMenuOp(); + break; default: fpr=new DNDAction(); } @@ -310,6 +313,7 @@ else if ( fpr->isName( DirCompareOp::name ) == true ) type = 66; else if ( fpr->isName( TabProfilesOp::name ) == true ) type = 67; else if ( fpr->isName( ExternalVDirOp::name ) == true ) type = 68; + else if ( fpr->isName( OpenTabMenuOp::name ) == true ) type = 69; return type; } diff -Nru worker-3.14.0/src/worker_commands.h worker-3.15.4/src/worker_commands.h --- worker-3.14.0/src/worker_commands.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/worker_commands.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* worker_commands.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2017 Ralf Hoffmann. + * Copyright (C) 2001-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -84,6 +84,8 @@ #include "externalvdirop.hh" +#include "opentabmenuop.hh" + #endif /* Local Variables: */ diff -Nru worker-3.14.0/src/worker.h worker-3.15.4/src/worker.h --- worker-3.14.0/src/worker.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/worker.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* worker.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2016 Ralf Hoffmann. + * Copyright (C) 2001-2017 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -260,6 +260,7 @@ void activateButton(int,int,int); void activateButton( int pos ); void activateHotkey( int pos ); + void activateCommandByID( int id, bool interactive = false ); int saveListerState(); int initListerState(); void updateTime(); diff -Nru worker-3.14.0/src/worker_locale.cc worker-3.15.4/src/worker_locale.cc --- worker-3.14.0/src/worker_locale.cc 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/worker_locale.cc 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* worker_locale.cc * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2017 Ralf Hoffmann. + * Copyright (C) 2001-2018 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -27,8 +27,8 @@ #include "nwc_path.hh" #include "datei.h" -#define CATENTRY 1209 -#define CATCOMENTRY 69 +#define CATENTRY 1217 +#define CATCOMENTRY 70 #define CATFLAGENTRY 59 WorkerLocale catalog; @@ -1315,6 +1315,14 @@ catalog[1206]=dupstring( "The given program will be executed and the output lines will be added to a new virtual directory as files. Each output line is considered one file name. Absolute paths will be used as is, relative paths will be interpreted relatively to the current directory." ); catalog[1207]=dupstring( "Program and arguments:" ); catalog[1208]=dupstring( "State bar font" ); + catalog[1209]=dupstring( "Preserve base directories in virtual dirs" ); + catalog[1210]=dupstring( "Failed to create some of the intermediate directories of %s" ); + catalog[1211]=dupstring( "Failed to prepare the intermediate directory information for %s" ); + catalog[1212]=dupstring( "Toggle lock state" ); + catalog[1213]=dupstring( "Lock tab" ); + catalog[1214]=dupstring( "Unlock tab" ); + catalog[1215]=dupstring( "Move to the left" ); + catalog[1216]=dupstring( "Move to the right" ); // catalog[]=dupstring( "" ); @@ -1387,6 +1395,7 @@ catalogcom[66]=dupstring( "Compare directories" ); catalogcom[67]=dupstring( "Tab profiles" ); catalogcom[68]=dupstring( "External virtual dir" ); + catalogcom[69]=dupstring( "Open tab menu" ); catalogflag[0]=dupstring( "String requester" ); catalogflag[1]=dupstring( "path" ); diff -Nru worker-3.14.0/src/workerversion.h worker-3.15.4/src/workerversion.h --- worker-3.14.0/src/workerversion.h 2017-12-08 22:27:07.000000000 +0000 +++ worker-3.15.4/src/workerversion.h 2019-01-28 21:40:22.000000000 +0000 @@ -1,6 +1,6 @@ /* workerversion.h * This file belongs to Worker, a file manager for UN*X/X11. - * Copyright (C) 2001-2017 Ralf Hoffmann. + * Copyright (C) 2001-2019 Ralf Hoffmann. * You can contact me at: ralf@boomerangsworld.de * or http://www.boomerangsworld.de/worker * @@ -23,8 +23,8 @@ #define WORKERVERSION_H #define WORKER_MAJOR 3 -#define WORKER_MINOR 14 -#define WORKER_PATCH 0 +#define WORKER_MINOR 15 +#define WORKER_PATCH 4 #define WORKER_COMMENT "" #endif diff -Nru worker-3.14.0/test-driver worker-3.15.4/test-driver --- worker-3.14.0/test-driver 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/test-driver 2019-01-28 21:41:03.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,35 +44,52 @@ Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. expect_failure=no color_tests=no enable_hard_errors=yes -while test $# -gt 0; do - case $1 in +while test $# -gt 1; do + arg=${1%=*} + val=${1#*=} + if [ $arg == $val ]; then + val=$2 + shift + fi + case $arg in --help) print_usage; exit $?;; --version) echo "test-driver $scriptversion"; exit $?;; - --test-name) test_name=$2; shift;; - --log-file) log_file=$2; shift;; - --trs-file) trs_file=$2; shift;; - --color-tests) color_tests=$2; shift;; - --expect-failure) expect_failure=$2; shift;; - --enable-hard-errors) enable_hard_errors=$2; shift;; - --) shift; break;; + --test-name) test_name=$val;; + --log-file) log_file=$val;; + --trs-file) trs_file=$val;; + --color-tests) color_tests=$val;; + --expect-failure) expect_failure=$val;; + --enable-hard-errors) enable_hard_errors=$val;; + --) break;; -*) usage_error "invalid option: '$1'";; esac - shift + [[ $arg != $val ]] && shift done +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='' # Red. @@ -94,11 +111,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -107,6 +127,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" @@ -122,6 +148,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru worker-3.14.0/ylwrap worker-3.15.4/ylwrap --- worker-3.14.0/ylwrap 2017-12-08 22:28:13.000000000 +0000 +++ worker-3.15.4/ylwrap 2019-01-28 21:41:03.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2012-12-21.17; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # Written by Tom Tromey . # @@ -40,7 +40,7 @@ # guard FILE # ---------- # The CPP macro used to guard inclusion of FILE. -guard() +guard () { printf '%s\n' "$1" \ | sed \ @@ -96,17 +96,17 @@ # The input. -input="$1" +input=$1 shift # We'll later need for a correct munging of "#line" directives. input_sub_rx=`get_dirname "$input" | quote_for_sed` -case "$input" in +case $input in [\\/]* | ?:[\\/]*) # Absolute path; do nothing. ;; *) # Relative path. Make it absolute. - input="`pwd`/$input" + input=`pwd`/$input ;; esac input_rx=`get_dirname "$input" | quote_for_sed` @@ -132,8 +132,8 @@ # guard in its implementation file. sed_fix_header_guards= -while test "$#" -ne 0; do - if test "$1" = "--"; then +while test $# -ne 0; do + if test x"$1" = x"--"; then shift break fi @@ -153,16 +153,14 @@ done # The program to run. -prog="$1" +prog=$1 shift # Make any relative path in $prog absolute. -case "$prog" in +case $prog in [\\/]* | ?:[\\/]*) ;; - *[\\/]*) prog="`pwd`/$prog" ;; + *[\\/]*) prog=`pwd`/$prog ;; esac -# FIXME: add hostname here for parallel makes that run commands on -# other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -188,7 +186,7 @@ # otherwise prepend '../'. case $to in [\\/]* | ?:[\\/]*) target=$to;; - *) target="../$to";; + *) target=../$to;; esac # Do not overwrite unchanged header files to avoid useless @@ -197,7 +195,7 @@ # output of all other files to a temporary file so we can # compare them to existing versions. if test $from != $parser; then - realtarget="$target" + realtarget=$target target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'` fi @@ -244,6 +242,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: