diff -Nru xfce4-xkb-plugin-0.7.1/aclocal.m4 xfce4-xkb-plugin-0.8.1/aclocal.m4 --- xfce4-xkb-plugin-0.7.1/aclocal.m4 2015-02-27 23:38:56.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/aclocal.m4 2017-09-08 20:51:35.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- 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, @@ -119,6 +119,51 @@ AC_SUBST($1)dnl ]) +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +dnl +dnl Copied from intlmacosx.m4 in gettext, GPL. +dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +glib_DEFUN([glib_gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + # GLIB_WITH_NLS #----------------- glib_DEFUN([GLIB_WITH_NLS], @@ -132,6 +177,8 @@ XGETTEXT=: INTLLIBS= + glib_gt_INTL_MACOSX + AC_CHECK_HEADER(libintl.h, [gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -215,7 +262,7 @@ fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -335,7 +382,7 @@ # on various variables needed by the Makefile.in.in installed by # glib-gettextize. dnl -glib_DEFUN([GLIB_GNU_GETTEXT], +AU_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl GLIB_LC_MESSAGES @@ -405,7 +452,8 @@ rm -f po/POTFILES sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES - ]) + ], + [[$0: This macro is deprecated. You should use upstream gettext instead.]]) # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) # ------------------------------- @@ -457,19 +505,19 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software +dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: @@ -489,32 +537,63 @@ AC_SUBST([USE_NLS]) ]) -# 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)))?$]) @@ -536,18 +615,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" && \ @@ -557,8 +637,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" @@ -570,10 +652,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 @@ -581,26 +664,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]) @@ -610,11 +691,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 @@ -631,7 +712,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 @@ -647,16 +728,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# 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_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 + + +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], @@ -667,16 +772,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], @@ -687,13 +794,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 @@ -702,9 +811,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, @@ -716,10 +825,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.14' +[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.14.1], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -735,14 +844,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.14.1])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, @@ -787,15 +896,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # 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, @@ -826,7 +934,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, @@ -1017,7 +1125,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, @@ -1093,7 +1201,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, @@ -1183,8 +1291,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 @@ -1257,7 +1365,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -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 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1286,7 +1398,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, @@ -1297,7 +1409,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'" ;; @@ -1307,7 +1419,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, @@ -1329,7 +1441,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# 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, @@ -1364,7 +1476,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, @@ -1414,7 +1526,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, @@ -1455,7 +1567,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, @@ -1482,7 +1594,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, @@ -1511,7 +1623,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# 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, @@ -1558,7 +1670,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# 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, @@ -1577,7 +1689,7 @@ # 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, @@ -1658,7 +1770,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, @@ -1718,7 +1830,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, @@ -1746,7 +1858,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, @@ -1765,7 +1877,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, @@ -2030,31 +2142,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) @@ -2113,9 +2200,7 @@ # 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 @@ -2123,36 +2208,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. +# 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. # -# 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 . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -2180,7 +2259,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 @@ -2204,7 +2283,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' @@ -2224,26 +2303,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"} @@ -2290,15 +2386,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 @@ -2311,7 +2408,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 @@ -2322,14 +2419,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 @@ -2382,21 +2479,21 @@ # _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 # 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. @@ -2528,8 +2625,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"`']) @@ -2553,7 +2650,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 ]) @@ -2581,7 +2678,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], @@ -2607,8 +2704,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], @@ -2654,7 +2751,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\\\\\\"" @@ -2667,7 +2764,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\\\\\\"" @@ -2683,7 +2780,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). @@ -2705,7 +2802,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 @@ -2728,7 +2825,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. @@ -2750,7 +2847,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 ) @@ -2763,10 +2860,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 @@ -2792,7 +2889,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 @@ -2812,27 +2909,31 @@ _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 +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# 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 @@ -2840,13 +2941,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 @@ -2863,8 +2975,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" @@ -2882,7 +2992,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -3079,7 +3188,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 @@ -3097,7 +3206,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 @@ -3115,7 +3224,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], @@ -3137,7 +3246,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 @@ -3147,32 +3256,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= @@ -3192,29 +3301,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 @@ -3234,7 +3343,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])], @@ -3252,7 +3361,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]) @@ -3272,8 +3381,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 @@ -3301,10 +3410,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]) ;; @@ -3330,16 +3439,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 ;; #( @@ -3349,14 +3459,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 # --------------- @@ -3364,31 +3474,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" @@ -3417,9 +3529,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 @@ -3429,7 +3578,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" @@ -3474,19 +3630,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 @@ -3494,7 +3651,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*) @@ -3503,7 +3660,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 ;; *) @@ -3519,7 +3676,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -3538,11 +3695,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 @@ -3550,7 +3707,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 @@ -3581,7 +3738,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -3617,7 +3774,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 @@ -3644,7 +3801,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -3666,7 +3823,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 @@ -3685,10 +3842,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]) @@ -3709,7 +3866,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*) @@ -3749,7 +3906,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` @@ -3799,22 +3956,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 @@ -3830,7 +3988,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) @@ -3858,7 +4016,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 @@ -3905,9 +4063,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 @@ -3933,7 +4091,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 @@ -3954,7 +4112,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 @@ -3964,44 +4122,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]) ]) ]) ]) @@ -4010,21 +4176,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], @@ -4034,7 +4200,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 @@ -4044,9 +4210,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -4138,8 +4304,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 @@ -4149,8 +4315,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 @@ -4177,8 +4343,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 @@ -4190,15 +4356,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 @@ -4212,12 +4378,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 @@ -4241,7 +4407,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]) @@ -4259,6 +4425,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 @@ -4269,17 +4476,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 @@ -4295,28 +4503,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--; } @@ -4330,7 +4545,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 @@ -4339,7 +4554,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -4356,14 +4571,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]]*) @@ -4371,41 +4589,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 ;; @@ -4415,18 +4683,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 ;; @@ -4434,8 +4702,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" @@ -4447,7 +4715,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -4456,8 +4724,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~ @@ -4473,17 +4741,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' @@ -4492,8 +4760,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*) @@ -4520,7 +4788,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'` @@ -4533,8 +4801,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' @@ -4547,7 +4815,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 @@ -4560,8 +4828,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`' @@ -4574,8 +4842,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 ;; @@ -4593,12 +4861,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 @@ -4623,26 +4892,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 ;; @@ -4660,14 +4918,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' @@ -4675,8 +4934,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 ;; @@ -4685,8 +4944,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, ... @@ -4699,8 +4958,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 @@ -4711,7 +4970,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 @@ -4719,8 +4978,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= @@ -4739,8 +4998,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 ;; @@ -4749,13 +5008,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 @@ -4780,14 +5059,15 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4804,12 +5084,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 @@ -4819,7 +5099,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 ;; @@ -4828,58 +5108,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*) @@ -4890,8 +5180,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 @@ -4901,11 +5191,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 @@ -4913,8 +5203,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) @@ -4935,24 +5225,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' @@ -4970,7 +5260,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 @@ -4978,8 +5268,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 ;; @@ -4988,20 +5278,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]) @@ -5034,39 +5334,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 : @@ -5089,11 +5391,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 @@ -5111,7 +5413,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 @@ -5138,16 +5440,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` ;; @@ -5161,7 +5463,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. @@ -5172,37 +5474,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 @@ -5288,13 +5627,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]]*) @@ -5321,8 +5660,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 @@ -5358,10 +5696,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5400,7 +5734,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 ;; @@ -5422,8 +5756,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)$' @@ -5476,6 +5810,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -5516,33 +5853,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 @@ -5553,21 +5895,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=: @@ -5575,8 +5917,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 @@ -5622,8 +5964,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 @@ -5635,7 +5977,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -5662,13 +6004,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 @@ -5680,11 +6037,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]) @@ -5703,7 +6060,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' ;; @@ -5755,7 +6112,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -5788,14 +6145,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= @@ -5813,21 +6200,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'" @@ -5867,11 +6257,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 @@ -5897,7 +6287,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} }; @@ -5917,9 +6307,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 @@ -5940,7 +6330,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= @@ -5967,12 +6357,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 @@ -5988,17 +6382,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*) @@ -6009,8 +6404,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 @@ -6026,6 +6421,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 @@ -6075,7 +6475,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 @@ -6116,14 +6516,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 @@ -6152,7 +6552,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -6160,7 +6560,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' @@ -6305,17 +6705,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*) @@ -6326,8 +6727,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 @@ -6344,6 +6745,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*) @@ -6414,7 +6820,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 @@ -6422,11 +6828,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*) @@ -6442,7 +6867,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*) @@ -6451,9 +6876,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' @@ -6478,6 +6903,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) @@ -6575,7 +7006,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 @@ -6604,7 +7035,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)= ;; @@ -6670,17 +7101,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 @@ -6726,9 +7161,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 @@ -6744,7 +7179,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 ;; @@ -6752,7 +7187,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -6762,7 +7197,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 @@ -6784,24 +7219,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 ... @@ -6814,7 +7249,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 @@ -6833,7 +7268,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) @@ -6849,7 +7284,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 @@ -6859,7 +7294,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 @@ -6867,61 +7302,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' ;; @@ -6932,42 +7395,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 @@ -6981,8 +7449,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 ;; @@ -7000,8 +7468,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 @@ -7013,7 +7481,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 @@ -7028,9 +7496,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 @@ -7047,15 +7515,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)= @@ -7071,7 +7539,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 @@ -7079,34 +7547,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 @@ -7125,13 +7616,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 @@ -7150,61 +7649,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 ;; @@ -7213,7 +7731,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) @@ -7243,16 +7761,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 @@ -7261,18 +7780,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 @@ -7281,7 +7800,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. @@ -7331,33 +7850,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 @@ -7365,25 +7884,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, [], [ @@ -7391,14 +7910,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 @@ -7409,7 +7928,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. @@ -7420,16 +7939,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; }]], @@ -7442,21 +7961,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 @@ -7471,7 +8000,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 ;; @@ -7479,27 +8008,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 @@ -7510,33 +8031,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' @@ -7547,24 +8088,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 @@ -7574,11 +8115,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 @@ -7588,10 +8129,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 @@ -7640,43 +8181,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 ;; @@ -7691,17 +8232,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 @@ -7718,7 +8259,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. @@ -7798,12 +8339,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 @@ -7844,10 +8385,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. @@ -7883,18 +8424,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' @@ -7902,8 +8443,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 @@ -7911,13 +8456,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 @@ -7925,14 +8470,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 @@ -7974,7 +8519,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;" @@ -8016,35 +8561,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 @@ -8080,18 +8625,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 @@ -8101,6 +8658,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 @@ -8119,13 +8683,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 @@ -8143,64 +8715,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 ;; @@ -8210,7 +8802,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 @@ -8238,57 +8830,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 @@ -8299,6 +8892,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++*) @@ -8333,18 +8954,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 @@ -8356,7 +8974,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. @@ -8365,11 +8983,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 @@ -8379,15 +8997,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 @@ -8413,13 +9031,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 @@ -8430,20 +9048,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 @@ -8458,22 +9076,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 @@ -8482,22 +9100,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 @@ -8505,8 +9123,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. @@ -8515,10 +9133,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. @@ -8532,59 +9150,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' @@ -8598,18 +9216,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 ;; *) @@ -8617,10 +9235,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 @@ -8678,22 +9296,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 @@ -8709,9 +9322,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 @@ -8729,17 +9342,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 @@ -8754,21 +9367,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 @@ -8814,9 +9427,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 @@ -8824,7 +9437,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' ;; @@ -8841,30 +9454,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 @@ -8872,11 +9485,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 @@ -8885,52 +9498,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 ;; @@ -8961,10 +9574,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 @@ -8991,7 +9604,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 @@ -9013,13 +9626,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 @@ -9103,13 +9717,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 @@ -9125,16 +9739,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 @@ -9142,9 +9756,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= @@ -9159,15 +9773,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 @@ -9198,51 +9812,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 ]) @@ -9251,7 +9820,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]) @@ -9271,10 +9840,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 @@ -9311,7 +9880,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 @@ -9333,7 +9902,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"} @@ -9347,21 +9916,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 @@ -9369,11 +9942,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 @@ -9390,9 +9963,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 @@ -9402,11 +9975,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 @@ -9443,7 +10016,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 @@ -9465,7 +10038,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"} @@ -9481,21 +10054,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 @@ -9503,11 +10080,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 @@ -9527,7 +10104,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 @@ -9537,7 +10114,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 @@ -9571,7 +10148,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. @@ -9604,7 +10181,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 @@ -9638,7 +10215,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. @@ -9671,7 +10248,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 @@ -9687,7 +10264,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 @@ -9697,7 +10274,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= @@ -9726,7 +10303,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 ]) @@ -9835,7 +10412,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 @@ -9852,9 +10429,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 @@ -9878,27 +10455,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 @@ -9922,102 +10479,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], @@ -10084,15 +10548,15 @@ # 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])]) @@ -10113,7 +10577,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 ]) @@ -10159,13 +10623,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 @@ -10193,7 +10659,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: @@ -10229,7 +10695,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: @@ -10238,9 +10704,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], @@ -10253,14 +10719,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) @@ -10292,9 +10758,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], @@ -10307,14 +10773,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) @@ -10346,9 +10812,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], @@ -10361,14 +10827,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) @@ -10385,14 +10851,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: @@ -10400,11 +10866,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@:>@], @@ -10415,19 +10934,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 @@ -10440,7 +10957,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: @@ -10463,7 +10980,8 @@ # 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 @@ -10496,7 +11014,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])], @@ -10507,7 +11025,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 @@ -10587,7 +11105,7 @@ # 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 @@ -10596,22 +11114,23 @@ # @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) ]) # 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 @@ -10622,7 +11141,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. # @@ -10636,7 +11155,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 @@ -10708,9 +11227,7 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -dnl $Id$ -dnl -dnl Copyright (c) 2002-2006 +dnl Copyright (c) 2002-2015 dnl The Xfce development team. All rights reserved. dnl dnl Written for Xfce by Benedikt Meurer . @@ -10738,7 +11255,7 @@ dnl We need recent a autoconf version -AC_PREREQ([2.53]) +AC_PREREQ([2.60]) @@ -11048,9 +11565,7 @@ ]) -dnl $Id$ -dnl -dnl Copyright (c) 2002-2006 +dnl Copyright (c) 2002-2015 dnl The Xfce development team. All rights reserved. dnl dnl Written for Xfce by Benedikt Meurer . @@ -11078,7 +11593,7 @@ dnl We need recent a autoconf version -AC_PREREQ([2.53]) +AC_PREREQ([2.60]) dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS) @@ -11126,9 +11641,9 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs" + -Wnested-externs" CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then @@ -11270,9 +11785,7 @@ fi ]) -dnl $Id$ -dnl -dnl Copyright (c) 2002-2006 +dnl Copyright (c) 2002-2015 dnl The Xfce development team. All rights reserved. dnl dnl Written for Xfce by Benedikt Meurer . diff -Nru xfce4-xkb-plugin-0.7.1/ChangeLog xfce4-xkb-plugin-0.8.1/ChangeLog --- xfce4-xkb-plugin-0.7.1/ChangeLog 2015-02-27 23:39:33.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/ChangeLog 2017-09-08 20:51:42.000000000 +0000 @@ -1,3 +1,1918 @@ +commit b34ba90db48b78ee60288c8e3dfa80c807da335b +Author: Viktor Odintsev +Date: Fri Sep 8 23:50:22 2017 +0300 + + Updates for release + +commit 422a613e98aec4f5532129acb845df7f985fd1f8 +Author: Viktor Odintsev +Date: Fri Sep 8 23:38:32 2017 +0300 + + Revert "Remove headers from SOURCES" + + This reverts commit c63760972fa9468f63d74861f2ddcb459a569396. + +commit 6325c3a3cc1002ebac12e6ed658818c0fb8804d4 +Author: Necdet Yücel +Date: Wed Sep 6 18:33:53 2017 +0200 + + I18n: Update translation tr (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 07f7551aed2b0e37b921143478d7243be1fb2bc6 +Author: Michael Martins +Date: Tue Aug 29 06:38:21 2017 +0200 + + I18n: Update translation pt_BR (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bbce961ddc247711e2fbc8bc10058cc13723bcfa +Author: abuyop +Date: Tue Aug 22 12:33:40 2017 +0200 + + I18n: Update translation ms (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1a47046022aaedb52423f6d28055b7663ed99a4d +Author: Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] +Date: Wed Aug 16 06:33:00 2017 +0200 + + I18n: Update translation es (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 046e9c8aa34ebead99a5fdb4dd3be57f6f4b2751 +Author: Vinzenz Vietzke +Date: Fri Aug 11 06:32:34 2017 +0200 + + I18n: Update translation de (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit abe574146e35e6f938de9f254ede495fc35c4a6b +Author: Viktor Odintsev +Date: Thu Aug 10 00:31:46 2017 +0200 + + I18n: Update translation ru (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit edef57f22b7195127f870f9978d8c66792c02125 +Author: Viktor Odintsev +Date: Wed Aug 9 14:03:20 2017 +0200 + + I18n: Update translation ru (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6e99feae12b22e8ea960bf61a2be2842806b95b0 +Author: José Vieira +Date: Tue Aug 8 12:31:45 2017 +0200 + + I18n: Update translation pt (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 86cc8e1ec1a2db9ecfd4f4b8a1390d0d553da830 +Author: Anonymous +Date: Mon Aug 7 18:31:46 2017 +0200 + + I18n: Update translation lt (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b7bc4a0b543b82e541ada0a891d4c1d42d88a2f7 +Author: Påvel Nicklasson +Date: Mon Jul 31 00:31:54 2017 +0200 + + I18n: Update translation sv (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 06c8b41ce91975768b3e176d7f4a4402a84e495a +Author: Andre Miranda +Date: Mon Jul 31 00:31:54 2017 +0200 + + I18n: Update translation pt_BR (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f19fcab5430b1b7bbe01f5c0bbed9922e970a595 +Author: Anonymous +Date: Mon Jul 31 00:31:54 2017 +0200 + + I18n: Update translation pl (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4a7b64effc4b69b295f9991de9ddecc5d02cd45c +Author: Sungjin Kang +Date: Sat Jul 29 00:32:21 2017 +0200 + + I18n: Update translation ko (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 817acf02853a94158313126d407d79214fd3fe7a +Author: Elishai Eliyahu +Date: Fri Jul 28 18:32:15 2017 +0200 + + I18n: Update translation he (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 01a87152b85869f6cad1d5eb686599bcdf1835a2 +Author: Pjotr +Date: Fri Jul 28 12:32:22 2017 +0200 + + I18n: Update translation nl (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 87369363e93566ea3d684b2e7cf4fdb4a0e3fb27 +Author: Jeff Huang +Date: Fri Jul 28 06:31:59 2017 +0200 + + I18n: Update translation zh_TW (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f6559d0aaa23c4c55cd08aedd4db3fd65932ce81 +Author: 张诚 +Date: Fri Jul 28 06:31:59 2017 +0200 + + I18n: Update translation zh_CN (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a3e899e29e2d0b73e257a30c12ded95e011cc797 +Author: Anonymous +Date: Fri Jul 28 06:31:59 2017 +0200 + + I18n: Update translation da (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5227cfba549cdf0990432e7763bb0017de200f38 +Author: Anonymous +Date: Thu Jul 27 18:33:50 2017 +0200 + + I18n: Update translation lt (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c635da93d3861a40cc7827ff55b87d08f1aa132b +Author: Yannick Le Guen +Date: Thu Jul 27 18:33:50 2017 +0200 + + I18n: Update translation fr (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 19d3ddc0a6bc0eac69cdbfe66964d6328bbc0316 +Author: Kukuh Syafaat +Date: Thu Jul 27 12:31:55 2017 +0200 + + I18n: Update translation id (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8bcdedea6d4eda4f6433d38bad8669f46ee726cd +Author: Edin Veskovic +Date: Thu Jul 27 12:31:55 2017 +0200 + + I18n: Update translation hr (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 33987271e658c47e2bf68f7f7dce2da0e19943a7 +Author: Pablo Roberto “Jristz” Lezaeta Reyes +Date: Thu Jul 27 12:31:55 2017 +0200 + + I18n: Update translation es (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1ffe3ca2b475548ad3ef698dd1f5c310f9ecb1f9 +Author: Michal Várady +Date: Thu Jul 27 12:31:55 2017 +0200 + + I18n: Update translation cs (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 89003a3706a4b7b3e78a66fe06af34f9aad22dd9 +Author: Robert Antoni Buj Gelonch +Date: Thu Jul 27 12:31:55 2017 +0200 + + I18n: Update translation ca (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2508bd42fbd2fe00e51ffb82878087f5707acb01 +Author: Kiril Kirilov +Date: Thu Jul 27 12:31:55 2017 +0200 + + I18n: Update translation bg (100%). + + 22 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3c1caeaee34b5c1483c5fbb702f5acc660a42a36 +Author: Igor +Date: Thu Jul 27 00:32:21 2017 +0200 + + I18n: Update translation ru (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f0b011509a9e9a93fab3dc83c86d49aa026c580d +Author: Xfce Bot +Date: Thu Jul 27 00:32:21 2017 +0200 + + I18n: Update translation fi (66%). + + 14 translated messages, 7 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 96c85fe35a38cfd6ee5610fef07a4e64b2879612 +Author: Viktor Odintsev +Date: Wed Jul 26 22:19:03 2017 +0300 + + Display warning tooltip if option is not available + +commit 31f23e250d9132fb2517e85121427b49fe035cd3 +Author: Viktor Odintsev +Date: Wed Jul 26 22:18:44 2017 +0300 + + Minor code style update + +commit f878faa6165bed5916f0b794a2570a5309c8a742 +Author: Xfce Bot +Date: Wed Jul 26 18:31:59 2017 +0200 + + I18n: Update translation it (66%). + + 14 translated messages, 7 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e8448320e12b529468f3fb2a3395fb9908d9dc53 +Author: Jeff Huang +Date: Tue Jul 25 18:45:26 2017 +0200 + + I18n: Update translation zh_TW (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 54b5637d5567ed4e99bcdcac267705e77eece034 +Author: wwj402 +Date: Tue Jul 25 18:45:26 2017 +0200 + + I18n: Update translation zh_CN (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ef2365ead1a40377d8df550c6b2edd2166cbbd9a +Author: Xfce Bot +Date: Tue Jul 25 18:45:26 2017 +0200 + + I18n: Update translation uz (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a4f707eefa20f6c51116abb7e87142f64cc0fb95 +Author: Xfce Bot +Date: Tue Jul 25 18:45:26 2017 +0200 + + I18n: Update translation uz@Latn (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3f9acdbf96a3d832db4a1c23ce2c137288492a01 +Author: Xfce Bot +Date: Tue Jul 25 18:45:25 2017 +0200 + + I18n: Update translation ur (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit eac816023dbd1e8054b473a4dbf207735fb14531 +Author: Xfce Bot +Date: Tue Jul 25 18:45:25 2017 +0200 + + I18n: Update translation ur_PK (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 840c44d8741ac8366b1f4b7a90fa1296c95037df +Author: Xfce Bot +Date: Tue Jul 25 18:45:25 2017 +0200 + + I18n: Update translation uk (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 89ab0af32f7e68896e925e3ff6782a972cb3375e +Author: Xfce Bot +Date: Tue Jul 25 18:45:25 2017 +0200 + + I18n: Update translation ug (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c1448066a811660fa2abe3356666f1a10a6b3c2d +Author: Necdet Yücel +Date: Tue Jul 25 18:45:25 2017 +0200 + + I18n: Update translation tr (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 77dd0adf4d0f3bdfc9794b3fd1e3ad5e0c60a1e6 +Author: Xfce Bot +Date: Tue Jul 25 18:45:25 2017 +0200 + + I18n: Update translation th (95%). + + 20 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 545c83a9e1451c7f4c03f0cd41388a13990beb66 +Author: Påvel Nicklasson +Date: Tue Jul 25 18:45:24 2017 +0200 + + I18n: Update translation sv (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5c1337e8d50e9fbc098996ff71f5b8367a5538ff +Author: Xfce Bot +Date: Tue Jul 25 18:45:24 2017 +0200 + + I18n: Update translation sr (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d5f6bae006c74735c41f505b80fa028ec7a15819 +Author: Xfce Bot +Date: Tue Jul 25 18:45:24 2017 +0200 + + I18n: Update translation sq (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit eebf23b32b49841a65b03097675c864ccfc81eca +Author: Anonymous +Date: Tue Jul 25 18:45:24 2017 +0200 + + I18n: Update translation sl (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 813f1bafcb34c457421e72f7861ff262af3071ee +Author: Dušan Kazik +Date: Tue Jul 25 18:45:24 2017 +0200 + + I18n: Update translation sk (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3c2f8d8255fbabe6140e0706e017ab2b7a31e3b3 +Author: Igor +Date: Tue Jul 25 18:45:24 2017 +0200 + + I18n: Update translation ru (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 03b25645428ad4d08092273768885dc2299e1651 +Author: Xfce Bot +Date: Tue Jul 25 18:45:24 2017 +0200 + + I18n: Update translation ro (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 196a5f44e532b5854ada843184d0511f584effcb +Author: Nuno Miguel +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation pt (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d0ebf7ee6a03f9d564cd4bc56576cd9d865615bd +Author: Miguel V. S. Frasson +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation pt_BR (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e14d0f8c61b671c8ecd0228626926af25ef31002 +Author: Anonymous +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation pl (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 843de552b4c3f926c38c4177f181e844bb02750e +Author: Xfce Bot +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation oc (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 18bc74f8a061c53504a7b310e3e46cdb49bb699e +Author: Pjotr +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation nl (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 09cb6504e654ed208148e5795f285804352fb1bc +Author: Allan Nordhøy +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation nb (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6f5f60e39c7a20e74bcda714f92429fc1c60e62c +Author: Xfce Bot +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation ms (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 67f4be7699d79d871155a91717080868c663e3eb +Author: Xfce Bot +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation lv (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 65a1ed510d449a933885b9927fb6e8b9f1cc958f +Author: Anonymous +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation lt (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 87ceeb4751125e39f509b014c0d3ae5e404674e8 +Author: 박정규(Jung-Kyu Park) +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation ko (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a1ad6e7fd89c875b98a4f51ef12322a9141a7570 +Author: Xfce Bot +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation kk (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f65fdd5703934a12021ff7885af4a05f79ec883d +Author: Xfce Bot +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation ja (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 59dd3fd3c088972dd37cad67f4222d70740af79e +Author: Xfce Bot +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation it (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d3b6a7146c23afa2ec5d74ed18b7d96914c5df7e +Author: Xfce Bot +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation is (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e555e2c65cab9b1048505e14cf6e39eeef9b0746 +Author: Kukuh Syafaat +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation id (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e5abd6a9ceda0802f7f5c9fcdbd24469bb8d634c +Author: Xfce Bot +Date: Tue Jul 25 18:45:23 2017 +0200 + + I18n: Update translation hu (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 42ffb651b4a25dbe8de7777d764c7d8e36de8367 +Author: Edin Veskovic +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation hr (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fffd0b01fac5d67750b5d856f84a51c85309631f +Author: Elishai Eliyahu +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation he (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3d8f64b293b54fb2da63275c7bee9994077b9933 +Author: Xfce Bot +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation gl (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e293ef80beb1496a6ae1db2c58e9f97c23a8dd34 +Author: Yannick Le Guen +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation fr (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ccbaf6580dfc58f8479e31b91b903c36cb80e736 +Author: Xfce Bot +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation fi (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d2dd19d79cbfdc18ecdc9f7956424fdadb694928 +Author: Xfce Bot +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation eu (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b6535ddb7053de23557251d262cd8583fe99c452 +Author: Pablo Roberto “Jristz” Lezaeta Reyes +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation es (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6fd084131e44c51511ec4fed72ae6626a8653ec3 +Author: Xfce Bot +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation en_GB (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 09e01fba00731c028d2505a9dbbd348340765c5c +Author: Xfce Bot +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation en_AU (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a2fab85fc72a634ebfe5b63709929edc019e2428 +Author: Xfce Bot +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation el (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 533e040d74912174408912de4d28448b5a937707 +Author: Tobias Bannert +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation de (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b99c9866fdf4fa438b6ae22f29a1dfc0fb9bbcdd +Author: Anonymous +Date: Tue Jul 25 18:45:22 2017 +0200 + + I18n: Update translation da (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bf63657ba9bd7a37b1709396c0e67e50d529e47f +Author: Michal Várady +Date: Tue Jul 25 18:45:21 2017 +0200 + + I18n: Update translation cs (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit acc4f3127b367cd5f0e12293fbdc3d4da85efc0c +Author: Robert Antoni Buj Gelonch +Date: Tue Jul 25 18:45:21 2017 +0200 + + I18n: Update translation ca (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 178a7535530c9f3aa006d44563ec6c014c8bb00f +Author: Kiril Kirilov +Date: Tue Jul 25 18:45:21 2017 +0200 + + I18n: Update translation bg (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 08687a5192d7fcdd70b25680814c872b854b3807 +Author: Xfce Bot +Date: Tue Jul 25 18:45:21 2017 +0200 + + I18n: Update translation be (57%). + + 12 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 63a115ddf36e5186381442b9ccff8adc5633500a +Author: Xfce Bot +Date: Tue Jul 25 18:45:21 2017 +0200 + + I18n: Update translation ast (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e16d0f144214b150661d8ad9545e7c74249acfcd +Author: Xfce Bot +Date: Tue Jul 25 18:45:21 2017 +0200 + + I18n: Update translation ar (61%). + + 13 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 17e55cd0a2bcebde54a06166d4191bfc05859752 +Author: Anonymous +Date: Mon Jul 24 13:47:33 2017 +0200 + + I18n: Update translation pl (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 260f7964d348b40653c30b137fe58ea3352c6e48 +Author: Necdet Yücel +Date: Mon Jul 24 12:33:53 2017 +0200 + + I18n: Update translation tr (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d3351056821fd7369f5db99468a0d4011cc66708 +Author: Anonymous +Date: Mon Jul 24 00:32:47 2017 +0200 + + I18n: Add new translation sl (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 041650f29819dc714e447efbdd195898127dfd97 +Author: Allan Nordhøy +Date: Mon Jul 24 00:32:47 2017 +0200 + + I18n: Update translation nb (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5eb88a72177ea57ca56db7691a2a83413c4221cb +Author: Tobias Bannert +Date: Wed Jul 19 18:32:48 2017 +0200 + + I18n: Update translation de (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 307b5722e9e284e02b7d2bf0c72e6d7597e994fd +Author: wwj402 +Date: Fri Jul 7 18:31:51 2017 +0200 + + I18n: Update translation zh_CN (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 37e6fcd927c880422bf26ee75c0839383e943baa +Author: Kukuh Syafaat +Date: Thu Jul 6 12:32:09 2017 +0200 + + I18n: Update translation id (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a225ca9e689dd973c981c2f75a6ea9c4cd604b17 +Author: Elishai Eliyahu +Date: Wed Jul 5 18:31:58 2017 +0200 + + I18n: Update translation he (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1d40879a94467d4621b483bb419f016f7ba2d7f8 +Author: Påvel Nicklasson +Date: Wed Jul 5 00:32:12 2017 +0200 + + I18n: Update translation sv (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9dc1d1b0ef86a3dcd4029ae1eb3e57bec6315a74 +Author: Dušan Kazik +Date: Tue Jul 4 12:38:15 2017 +0200 + + I18n: Update translation sk (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4df7a469a48c12bc4abcc3c1461c606849f4990b +Author: Jeff Huang +Date: Mon Jul 3 18:31:44 2017 +0200 + + I18n: Update translation zh_TW (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 36e113e22f81f617ec423667160c333c2c188566 +Author: Miguel V. S. Frasson +Date: Mon Jul 3 18:31:44 2017 +0200 + + I18n: Update translation pt_BR (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a24999e44d8d8e971dc93fcde6c9e3495bb67d57 +Author: Anonymous +Date: Mon Jul 3 12:32:03 2017 +0200 + + I18n: Update translation da (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1ea4e304ed5406a9fb7526c7e12734c0e5e9c4de +Author: Igor +Date: Sun Jul 2 18:31:50 2017 +0200 + + I18n: Update translation ru (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d341c7bbf3317ae663d4481bc05f3e7e4308ec8e +Author: Anonymous +Date: Sun Jul 2 18:31:50 2017 +0200 + + I18n: Update translation lt (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 68ed3ffb0bfd2be364988a974d839606633d5afe +Author: Edin Veskovic +Date: Sun Jul 2 18:31:50 2017 +0200 + + I18n: Update translation hr (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 888ea9ef85b1634b91ebda52cfae1f648f39a6ed +Author: Yannick Le Guen +Date: Sun Jul 2 18:31:50 2017 +0200 + + I18n: Update translation fr (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7328908aa205ed656e26761ce12e5841e68ed046 +Author: Pjotr +Date: Sun Jul 2 12:31:44 2017 +0200 + + I18n: Update translation nl (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 831cbccb107bedeae99732072ffd49ebb977703b +Author: 박정규(Jung-Kyu Park) +Date: Sun Jul 2 12:31:44 2017 +0200 + + I18n: Update translation ko (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b28ef2d22396194cc4f28f32b13f2cbfa190a133 +Author: Michal Várady +Date: Sun Jul 2 12:31:44 2017 +0200 + + I18n: Update translation cs (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 759902c9ab5cee791bd16081c57cc7974a2d8eff +Author: Robert Antoni Buj Gelonch +Date: Sun Jul 2 12:31:44 2017 +0200 + + I18n: Update translation ca (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 42c9598572d36302807565fd0e0df484189fd6a7 +Author: Kiril Kirilov +Date: Sun Jul 2 12:31:44 2017 +0200 + + I18n: Update translation bg (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c29d32c1a7f9d22f5195a33348f7ce2c7b90c800 +Author: Viktor Odintsev +Date: Sun Jul 2 00:57:04 2017 +0300 + + Cleanup type casts + +commit d418859b2c1878ed3a228835503323387880e75b +Author: Viktor Odintsev +Date: Thu Jun 29 00:04:15 2017 +0300 + + Make caps lock indicator configurable + +commit 15e4075ac2cec6327c58c932c34b2835d569cd5a +Author: Tobias Bannert +Date: Wed Jun 28 18:31:52 2017 +0200 + + I18n: Update translation de (95%). + + 19 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 95e70239328e97545388b1658250828eca26bf2a +Author: Viktor Odintsev +Date: Mon Jun 26 23:24:58 2017 +0300 + + Simplify XkbDialog code + + Remove useless DialogInstance structure. + Replace g_signal_connect with g_object_bind_property_full. + +commit 187e5a994300166f3db9ee20de052ae237f59a04 +Author: Viktor Odintsev +Date: Thu Jun 22 10:50:21 2017 +0300 + + Move group policy management to XkbKeyboard + +commit 79d87c40bfe8126600bf5d861afe8f04dce9b985 +Author: Viktor Odintsev +Date: Thu Jun 22 03:11:43 2017 +0300 + + Display capslock state with system style + +commit d6cdb45e45f1c498c4d13cdb71aea19a03314d33 +Author: Viktor Odintsev +Date: Thu Jun 22 01:10:53 2017 +0300 + + Update code style + +commit c63760972fa9468f63d74861f2ddcb459a569396 +Author: Viktor Odintsev +Date: Wed Jun 21 15:31:31 2017 +0300 + + Remove headers from SOURCES + +commit 3c7064a36792eab9108af5acbdabd01768ad624e +Author: Viktor Odintsev +Date: Wed Jun 21 15:31:00 2017 +0300 + + Move wnck-related code to XkbKeyboard + +commit c1aa3d53e5d7c3ef6391964c600f91b2df708e34 +Author: Viktor Odintsev +Date: Wed Jun 21 11:21:27 2017 +0300 + + Replace XkbKeyboard callback with signal + +commit 3ea0ce78fe7862e5df18f6bb4a64c2189b697bd1 +Author: Kukuh Syafaat +Date: Tue Jun 20 12:32:02 2017 +0200 + + I18n: Update translation id (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6bc5b35c88822f140bb09cbe60c2217f8a4ec207 +Author: Påvel Nicklasson +Date: Mon Jun 19 00:32:04 2017 +0200 + + I18n: Update translation sv (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bf6d56ee36d348133fb446fa931cbe69108b6aa1 +Author: Simon Steinbeiss +Date: Sun Jun 18 00:37:25 2017 +0300 + + Fix GtkSwitch alignment in properties dialog + +commit 5691ad643459f37052eadda7a034d86abdef4b4d +Author: ToZ +Date: Sat Jun 17 07:43:59 2017 -0500 + + Fix typo in previous commit + +commit b5a5dd8618a05d0aae2e14e3510e5402f1f0a184 +Author: Viktor Odintsev +Date: Fri Jun 16 20:45:27 2017 +0300 + + Back to development + +commit 3f7868d7174e20773aa4fd8f10ba92e706f819b0 +Author: Viktor Odintsev +Date: Fri Jun 16 20:20:46 2017 +0300 + + Updates for release + +commit f1f93c8a517262ab50f6c17a75f23b428179875e +Author: 玉堂白鹤 +Date: Thu Jun 15 12:32:06 2017 +0200 + + I18n: Update translation zh_CN (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e81a432c097b7ee0db695d1b2c19f20e8c93fa8d +Author: Pablo Roberto “Jristz” Lezaeta Reyes +Date: Thu Jun 15 12:32:06 2017 +0200 + + I18n: Update translation es (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit da94977f2ebe74de24897d3d346516a0a33cb64d +Author: Viktor Odintsev +Date: Tue Jun 13 04:56:19 2017 +0300 + + Remove useless code from xkb-cairo.c + +commit 534d014a44a6268df41b3b34c9c900a9625cfd8b +Author: Theppitak Karoonboonyanan +Date: Mon Jun 12 18:32:05 2017 +0200 + + I18n: Update translation th (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a074fe37c8ca4b9440856b73e5979137edd6559c +Author: Elishai Eliyahu +Date: Mon Jun 12 18:32:05 2017 +0200 + + I18n: Update translation he (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f07e8dfda23692e8fec71af1f0284fd8e39e6f35 +Author: André Miranda +Date: Mon Jun 12 06:32:00 2017 +0200 + + I18n: Update translation pt_BR (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2d155da6dcb8f7541bbe82352eb221992b09f138 +Author: Michal Várady +Date: Mon Jun 12 00:31:50 2017 +0200 + + I18n: Update translation cs (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b1990253d6883fa085c9be2f5120fbe716a3737e +Author: Igor +Date: Sun Jun 11 18:31:53 2017 +0200 + + I18n: Update translation ru (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit deac172635d065682c045d34e173675a524287fa +Author: Viktor Odintsev +Date: Sun Jun 11 18:35:19 2017 +0300 + + Fix memory leak in xkb_util_get_flag_filename + +commit 30ed82d25354d97042a9155351cbd96e12ab82fb +Author: Edin Veskovic +Date: Sun Jun 11 12:31:57 2017 +0200 + + I18n: Update translation hr (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e43cc069d678f6aac0cc680e72f0646ae2ef45c4 +Author: Yannick Le Guen +Date: Sun Jun 11 12:31:57 2017 +0200 + + I18n: Update translation fr (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c95107d6dbef1e67b871f14c402111210f250d22 +Author: Anonymous +Date: Sun Jun 11 00:31:44 2017 +0200 + + I18n: Update translation lt (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4aaf0fd7e8c2945d8a93b5e1e07681714bc04238 +Author: Robert Antoni Buj Gelonch +Date: Sun Jun 11 00:31:44 2017 +0200 + + I18n: Update translation ca (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3b02d6e3a6a8146ac4e3b1a387bb1b1dd1a55743 +Author: Viktor Odintsev +Date: Sun Jun 11 01:21:17 2017 +0300 + + Fix memory leak caused by previous commit + +commit 030fed38d640bbcb292dde6c9e054b1b91488e90 +Author: Viktor Odintsev +Date: Sat Jun 10 21:54:54 2017 +0300 + + Bug 12550: Keep keyboard configuration between X-config callback calls + + libklavier can send weird data on configuration changes + (e.g. when new keyboard connected) which lead to configuration reset. + + My approach is creating a timer for each callback call after which + the configuration will be updated. Each callback call will destroy + the running timer and create a new one. + +commit 8b865d808f5357000f4a0c80a6d149d8de6f0ed5 +Author: Jeff Huang +Date: Sat Jun 10 18:32:22 2017 +0200 + + I18n: Update translation zh_TW (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 331b6df535eab27f348e5e15ace58d6b35e5d63f +Author: Pjotr +Date: Sat Jun 10 18:32:22 2017 +0200 + + I18n: Update translation nl (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5b599d9c06ecc35d29f84638cea7ecdca3827e98 +Author: 박정규(Jung-Kyu Park) +Date: Sat Jun 10 18:32:22 2017 +0200 + + I18n: Update translation ko (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f7610b2c6a0207b55800d71463dadbc0208a0cff +Author: Anonymous +Date: Sat Jun 10 18:32:22 2017 +0200 + + I18n: Update translation da (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 10620ad818823a1090378dbd9aa3c72e6703313e +Author: Kiril Kirilov +Date: Sat Jun 10 18:32:22 2017 +0200 + + I18n: Update translation bg (100%). + + 21 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7f74d7e811e8031d4e8c475919493d93dd0bbf3d +Author: Viktor Odintsev +Date: Mon Jun 5 17:53:14 2017 +0300 + + Bug 12884: Load flags from XDG_DATA_HOME if present + +commit e1a4ae185bc65a3905aff1922f3a2601e25f6c04 +Author: Viktor Odintsev +Date: Sun Apr 30 18:04:47 2017 +0300 + + Cleanup pointers to consts + +commit 36a6e59403cb9c9b9b51c46b8d6b9f065841c585 +Author: Viktor Odintsev +Date: Wed Apr 19 02:06:13 2017 +0300 + + Bug 12294: Use local charset for layout names + +commit 775f3d67b780bc6a69ce8b38d3bc9bb99102fff8 +Author: Viktor Odintsev +Date: Wed Apr 19 01:58:56 2017 +0300 + + Fix IT_PROG_INTLTOOL warning + +commit 0a8d39d4c0bc138e47c8dbc476e5f04fb88eecdc +Author: Viktor Odintsev +Date: Fri Mar 31 13:51:38 2017 +0300 + + Allow to display language name instead of country name + + For example, the "EN" text will be shown instead of "US" in case of + "en_US" locale. This behavior is configurable. + + A memory-stored GdkPixbuf is used to draw an image now. + +commit 22a54b07f5ee80940fe419152c1530f8d0cf8dbb +Author: Viktor Odintsev +Date: Fri Mar 31 10:08:43 2017 +0300 + + Reorganize includes + +commit d124b618cd7eff9fcf7e3d8bbb1c20d31f311b43 +Author: Viktor Odintsev +Date: Wed Mar 29 13:59:50 2017 +0300 + + Move dialog callbacks to xkb-plugin source + +commit 7de49ae2612fe9e13d26064d539e3082ebf40893 +Author: Viktor Odintsev +Date: Tue Mar 28 15:27:43 2017 +0300 + + Merge xfce4-xkb-plugin and xkb-callbacks + + XkbPlugin extends XfcePanelPlugin now. + Callbacks shouldn't be placed separately with object + so they were merged into single file. + +commit bd69f3b3f405db13d0fcd82f56e498aa5743c0eb +Author: Viktor Odintsev +Date: Tue Mar 28 10:05:07 2017 +0300 + + Move xkb-config to xkb-keyboard + + XkbKeyboard is the object now. + xkb-config was renamed because "config" may be confusing. + +commit 24c154d92fbd2a0973512a5e68c56e3184fed4ef +Author: Viktor Odintsev +Date: Mon Mar 20 20:56:28 2017 +0300 + + Bug 12441: Rename Indian flag filename + +commit 11377f0fcbeb71d57652c29a6dfc3f8f3b5ebef4 +Author: Viktor Odintsev +Date: Mon Mar 20 20:50:56 2017 +0300 + + Bug 12630: Fix typo in README + +commit 862e0e0dd56541ce6622f372fb6ad71bf338b699 +Author: Viktor Odintsev +Date: Fri Mar 17 02:07:30 2017 +0300 + + Refactor menus and remove deprecations + + Panel button's behavior was refactored. + Removed deprecated GtkImageMenuItem usage. + +commit 0d77ca975a04077fd2cb30dee090ed258d3f657a +Author: Viktor Odintsev +Date: Thu Mar 16 04:16:03 2017 +0300 + + Allow to hide tooltip icon + +commit cc2119154dd3fd41d369689a9c07fb2f90feb638 +Author: Viktor Odintsev +Date: Thu Mar 16 03:45:29 2017 +0300 + + Update settings dialog style + +commit 0f72f634988fe39eb9e07ec1803e2310957a50cb +Author: Viktor Odintsev +Date: Wed Mar 15 22:06:11 2017 +0300 + + Add xfconf support + +commit d1689c7acb6dca933952c362d197020b37b07d33 +Author: Viktor Odintsev +Date: Wed Mar 15 17:09:39 2017 +0300 + + Introduce new plugin style + +commit b6716e83da0e98b63ea1203f7ef766e1c498e45c +Author: Viktor Odintsev +Date: Wed Mar 15 15:10:13 2017 +0300 + + Port to GTK 3 + +commit cace06d1b3eae15dddce66b2389c832659e39bdc +Author: Kukuh Syafaat +Date: Sun Feb 26 12:32:24 2017 +0100 + + I18n: Update translation id (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1f42a672af0c1783102ae7561909eef2c435ae04 +Author: Ivica Kolić +Date: Thu Feb 2 06:33:20 2017 +0100 + + I18n: Update translation hr (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fe76aa8bf81251dd4d891bb8a854de417d1943d2 +Author: Anonymous +Date: Mon Jan 23 00:34:05 2017 +0100 + + I18n: Update translation da (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6841afbc42cc8ff7eb7e714b9699a39e18d223eb +Author: Cédric Valmary +Date: Sun Oct 23 18:32:39 2016 +0200 + + I18n: Update translation oc (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ae64f6652f427287e247cdd3dc576f8b37f2e3be +Author: Baurzhan Muftakhidinov +Date: Fri Sep 30 06:31:33 2016 +0200 + + I18n: Update translation kk (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 007aa270e0fc11a90e70442e1e49aa0bf36f9803 +Author: Baurzhan Muftakhidinov +Date: Thu Sep 29 12:31:34 2016 +0200 + + I18n: Update translation kk (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c51dc11ba8ac0e723f1a8b7cefe01bdcd38467c1 +Author: Anonymous +Date: Fri Jun 24 18:33:33 2016 +0200 + + I18n: Update translation lt (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fdc018928f32da455de8ffde9496206cee22aea8 +Author: Morten Juhl-Johansen Zölde-Fejér +Date: Fri Jun 24 00:32:19 2016 +0200 + + I18n: Update translation da (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ec81c34ecdd2d970f57b58dd7ec7c022a828c6ed +Author: Robert Antoni Buj i Gelonch +Date: Wed May 4 12:32:42 2016 +0200 + + I18n: Update translation ca (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 36237287b96389e865671026485a8d95b979530b +Author: Robert Antoni Buj i Gelonch +Date: Mon May 2 18:33:37 2016 +0200 + + I18n: Update translation ca (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 886f88a9244d9f840bf7629e4c1f69d884484a35 +Author: Robert Antoni Buj i Gelonch +Date: Mon May 2 00:37:16 2016 +0200 + + I18n: Update translation ca (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 24345fa4b50c6c4d07033f1dfd7e29875776ccff +Author: Anonymous +Date: Sat Apr 30 00:32:48 2016 +0200 + + I18n: Update translation lt (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7c5774dc1661401f1e0b82f51edce2b470d62c37 +Author: gyeben +Date: Sat Apr 2 00:32:26 2016 +0200 + + I18n: Update translation hu (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 82e6036bea4675e22fd03074379a3276b3e3c3ae +Author: Davidmp +Date: Fri Apr 1 18:32:21 2016 +0200 + + I18n: Update translation ca (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 641a586ac542ccbd6f289f24e9909194ccedd4e1 +Author: Sergey Alyoshin +Date: Tue Mar 29 00:31:21 2016 +0200 + + I18n: Update translation ru (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 97c7fcc864ab95161d0ccd026c1924819077ec3d +Author: Nobuhiro Iwamatsu +Date: Mon Mar 7 06:32:09 2016 +0100 + + I18n: Update translation ja (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f2752d000f70eca473ceb258b75f95bcfc60ee93 +Author: GenghisKhan +Date: Sun Feb 7 18:31:59 2016 +0100 + + I18n: Update translation he (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit dfb72f1d2a4a364065c53ef0d583d57a28e5d628 +Author: Sveinn í Felli +Date: Wed Dec 9 18:31:41 2015 +0100 + + I18n: Update translation is (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7db04cb91d68d033b4cbc2170fbe63132b2971e0 +Author: Anonymous +Date: Sat Nov 14 18:31:20 2015 +0100 + + I18n: Update translation el (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e6cfc6842ae26b69d0f9ef16a1d0ce2b2b06a3d2 +Author: Dušan Kazik +Date: Fri Oct 23 00:33:13 2015 +0200 + + I18n: Update translation sk (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 838f6f533b76b062dc9aab0c0911406ec59049b8 +Author: oblo +Date: Thu Oct 15 00:31:33 2015 +0200 + + I18n: Update translation it (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0f288bc11c31863522ef8ce20d76a3c3b77768cd +Author: Piotr Strębski +Date: Thu Sep 17 12:31:46 2015 +0200 + + I18n: Update translation pl (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 88814e0f4204543a390d8770cb9b77defe37a8ac +Author: Nuno Miguel +Date: Mon Sep 14 18:31:47 2015 +0200 + + I18n: Update translation pt (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7150c1a4a1d63dadeecb66f9e0c48c2e1725749b +Author: Michael Findlay +Date: Sat Sep 12 12:31:43 2015 +0200 + + I18n: Update translation en_AU (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7038bee690952ffccdd0ca092808a66526403668 +Author: Necdet Yücel +Date: Mon Aug 31 18:31:34 2015 +0200 + + I18n: Update translation tr (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4120cda96c67a58c66da88fa7dc9ded49b890d70 +Author: Yarema aka Knedlyk +Date: Thu Aug 6 18:31:33 2015 +0200 + + I18n: Update translation uk (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a9167f534c8638fb15c46ecd3b65347abcbf5cc6 +Author: 白铭骢 +Date: Wed Aug 5 18:31:40 2015 +0200 + + I18n: Update translation zh_CN (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4fb663778ef55b54b22fd950b0cd02b6b4666efb +Author: abuyop +Date: Fri Jul 31 12:31:48 2015 +0200 + + I18n: Update translation ms (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9721f4c6db7f03ac4748f8c3ec60b3c75fdf5339 +Author: Allan Nordhøy +Date: Wed Jul 29 06:31:38 2015 +0200 + + I18n: Update translation nb (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b606543f27d0fbc9c853bc3c513454e40940ba71 +Author: Påvel Nicklasson +Date: Mon Jul 20 00:36:03 2015 +0200 + + I18n: Update translation sv (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5ef38301b6f4cfa08b8649b10715f02e37b51691 +Author: Seong-ho Cho +Date: Sat Jul 11 12:31:34 2015 +0200 + + I18n: Update translation ko (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3579af5bce081f3f1d425d9eb433cb6b9dad94fc +Author: Саша Петровић +Date: Thu Jul 9 12:31:32 2015 +0200 + + I18n: Update translation sr (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2866c7f1fa126efb5ef194175070b0352b3af132 +Author: Theppitak Karoonboonyanan +Date: Mon Jul 6 12:32:03 2015 +0200 + + I18n: Update translation th (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8119587e99bc28bed4dce483ace87f8fe008b62b +Author: Sergey Alyoshin +Date: Sun Jul 5 12:31:42 2015 +0200 + + I18n: Update translation ru (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a8bc562147a38eaaa6f18048b9ea8c1367c7534b +Author: Marcio Andre Padula +Date: Sun Jul 5 06:32:21 2015 +0200 + + I18n: Update translation pt_BR (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b0ae397e1e4ac9dd6e8f536d48a50fe1f2b4cc33 +Author: Michal Várady +Date: Sat Jul 4 06:31:42 2015 +0200 + + I18n: Update translation cs (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7d6a1056ad7dc51d60d2b7a8860e4be2c06d4831 +Author: Pjotr +Date: Wed Jul 1 18:31:43 2015 +0200 + + I18n: Update translation nl (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 85e3e552b532e3cf7be9d6a42f0f6c00e66bbbf8 +Author: GenghisKhan +Date: Wed Jul 1 18:31:43 2015 +0200 + + I18n: Update translation he (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 19cfc2e4ae14065511d21de31b25845906964747 +Author: Tobias Bannert +Date: Wed Jul 1 18:31:43 2015 +0200 + + I18n: Update translation de (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6809cfa0bfd99e538d2de75007a6b78d45222509 +Author: Kiril Kirilov +Date: Wed Jul 1 18:31:43 2015 +0200 + + I18n: Update translation bg (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 24f37e63c3262e889374541f2db93e9975b6874b +Author: Jeff Huang +Date: Wed Jul 1 12:32:49 2015 +0200 + + I18n: Update translation zh_TW (100%). + + 15 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c61c69b811a69a90973d9d922d426c99ac47a511 +Author: Igor Slepchin +Date: Tue Mar 31 20:27:53 2015 -0400 + + Bug 11729: Update Russian flag colors + +commit df86d1490a4491fe29056a5a1ee10093d5a9e146 +Author: Igor Slepchin +Date: Tue Mar 31 18:40:12 2015 -0400 + + Bug 11681: Allow adjusting flag sizes + + While at it, use a slider for adjusting text sizes too. + +commit 7c7f505af95a633a78dc39f5a6214958e6bfc484 +Author: Efstathios Iosifidis +Date: Thu Mar 19 12:32:37 2015 +0100 + + I18n: Update translation el (100%). + + 17 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 71f3a24cecdc03e1a47e09ac46d545e0d0f179d5 +Author: Anonymous +Date: Thu Mar 12 00:32:35 2015 +0100 + + I18n: Update translation lt (100%). + + 17 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a2f62ab0991feabb4405aecb15cc6a82cf823e21 +Author: Igor Slepchin +Date: Fri Feb 27 18:40:27 2015 -0500 + + Post release tag bump. + commit ba8007dad15d37227e6f8182d2264c017aa1464e Author: Igor Slepchin Date: Fri Feb 27 17:35:33 2015 -0500 @@ -2396,7 +4311,7 @@ 2009-07-25 Gabor Kelemen - * hu.po: Translation reworked. + * hu.po: Translation reworked. (Old svn revision: 7826) @@ -2468,18 +4383,18 @@ Author: Masato Hashimoto Date: Thu Mar 19 15:08:03 2009 +0000 - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) - * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) + * ja.po: Japanese translation update (Masato Hashimoto) (Old svn revision: 6949) @@ -2555,9 +4470,9 @@ Author: Per Kongstad Date: Thu Feb 19 19:45:53 2009 +0000 - * ru.po: Russian translation updated (Pavel Lakushev) - * ru.po: Russian translation updated (Pavel Lakushev) - * ru.po, LINGUAS: Russian translation added (Pavel Labushev) + * ru.po: Russian translation updated (Pavel Lakushev) + * ru.po: Russian translation updated (Pavel Lakushev) + * ru.po, LINGUAS: Russian translation added (Pavel Labushev) (Old svn revision: 6723) @@ -2566,25 +4481,25 @@ Date: Mon Feb 9 00:44:52 2009 +0000 xfce4-cddrive-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-radio-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-xkb-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-xfapplet-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-sensors-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-dict/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-teatime-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-cellmodem-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) thunar-shares-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfmpc/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) (Old svn revision: 6664) @@ -2680,45 +4595,45 @@ Date: Sat Dec 20 21:52:03 2008 +0000 xfce4-taskmanager/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-time-out-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-wavelan-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-radio-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-datetime-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-cpufreq-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfburn/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-xkb-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-smartbookmark-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-smartpm-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) thunar-media-tags-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfvnc/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-verve-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-xfapplet-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) thunar-archive-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-websearch-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-screenshooter-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-teatime-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-rss-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfmpc/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) (Old svn revision: 6343) @@ -2799,7 +4714,7 @@ Author: Alexander Nyakhaychyk Date: Sun Nov 9 12:00:20 2008 +0000 - * Belarusian translation update + * Belarusian translation update (Old svn revision: 6033) @@ -3122,8 +5037,8 @@ 2007-04-04 Alexander Nyakhaychyk Date: Mon Mar 27 21:45:40 2006 +0000 - 2006-03-08 Alexander Iliev + 2006-03-08 Alexander Iliev - * aclocal.m4, config.guess, config.h.in, config.sub, - configure, flags/Makefile.in, install-sh, ltmain.sh, - Makefile.in, missing, mkinstalldirs, - panel-plugin/Makefile.in: Deleted from repository as - these are generated by autotools. + * aclocal.m4, config.guess, config.h.in, config.sub, + configure, flags/Makefile.in, install-sh, ltmain.sh, + Makefile.in, missing, mkinstalldirs, + panel-plugin/Makefile.in: Deleted from repository as + these are generated by autotools. @@ -3492,13 +5407,13 @@ Author: Alexander Iliev Date: Mon Mar 27 21:01:56 2006 +0000 - 2006-03-28 Alexander Iliev + 2006-03-28 Alexander Iliev - * configure.ac: Version updated to 0.4.1; redundant version - code replaced with autoconf function. + * configure.ac: Version updated to 0.4.1; redundant version + code replaced with autoconf function. - * panel-plugin/xkb.c, panel-plugin/xfce4-xkb-plugin.c: Fixed - a size issue with text layout display. + * panel-plugin/xkb.c, panel-plugin/xfce4-xkb-plugin.c: Fixed + a size issue with text layout display. @@ -3508,10 +5423,10 @@ Author: Alexander Iliev Date: Mon Mar 27 13:11:05 2006 +0000 - 2006-03-27 Alexander Iliev + 2006-03-27 Alexander Iliev - * panel-plugin/xkb.c: Added code to filter "inet" and "pc" - xkb symbols. + * panel-plugin/xkb.c: Added code to filter "inet" and "pc" + xkb symbols. @@ -3549,7 +5464,7 @@ 2006-03-19 12:20 Alexander Iliev - * po/bg.po: Added bulgarian translation. + * po/bg.po: Added bulgarian translation. @@ -3613,18 +5528,18 @@ Author: Alexander Iliev Date: Thu Mar 16 23:41:38 2006 +0000 - * panel-plugin/xfce4-xkb-plugin.c: Updated for the new Xfce 4.4 panel + * panel-plugin/xfce4-xkb-plugin.c: Updated for the new Xfce 4.4 panel plugin interface. - * panel-plugin/xkb.c: Fixed a problem with not checking the - t_xkb enable_perapp option and always working in per application - mode. + * panel-plugin/xkb.c: Fixed a problem with not checking the + t_xkb enable_perapp option and always working in per application + mode. - * panel-plugin/Makefile.am, autogen.sh, configure.ac: Using Xfce - dev-tools. + * panel-plugin/Makefile.am, autogen.sh, configure.ac: Using Xfce + dev-tools. - * panel-plugin/xkb-plugin.desktop.in: Added for the new panel plugin - interface. + * panel-plugin/xkb-plugin.desktop.in: Added for the new panel plugin + interface. @@ -3635,7 +5550,7 @@ Date: Mon Mar 6 09:49:33 2006 +0000 2006-03-06 11:54 sasoiliev - * configure.ac: Updated version to 0.3.3. + * configure.ac: Updated version to 0.3.3. diff -Nru xfce4-xkb-plugin-0.7.1/compile xfce4-xkb-plugin-0.8.1/compile --- xfce4-xkb-plugin-0.7.1/compile 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/compile 2017-09-08 20:51:36.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,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 xfce4-xkb-plugin-0.7.1/config.guess xfce4-xkb-plugin-0.8.1/config.guess --- xfce4-xkb-plugin-0.7.1/config.guess 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/config.guess 2017-09-08 20:51:36.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2014-03-23' +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-2014 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." @@ -168,19 +168,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 ;; + 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}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-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 \ @@ -197,6 +207,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 @@ -207,13 +224,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.//'` @@ -223,6 +240,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +256,9 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,42 +275,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 @@ -359,16 +383,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/[^.]*//'` @@ -393,7 +417,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} @@ -579,8 +603,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 @@ -617,13 +642,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 @@ -662,11 +687,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 @@ -679,12 +704,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} @@ -789,14 +814,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:*:*) @@ -812,10 +837,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -878,7 +904,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -901,7 +927,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}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -932,6 +958,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -944,6 +973,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -969,6 +1001,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1001,6 +1036,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1020,7 +1058,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1099,7 +1137,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 ;; @@ -1248,6 +1286,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 ;; @@ -1261,16 +1302,23 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; 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 + (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 @@ -1285,7 +1333,7 @@ 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 +1342,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 +1367,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 +1409,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,23 +1420,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; 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 xfce4-xkb-plugin-0.7.1/config.h.in xfce4-xkb-plugin-0.8.1/config.h.in --- xfce4-xkb-plugin-0.7.1/config.h.in 2015-02-27 23:39:05.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/config.h.in 2017-09-08 20:51:36.000000000 +0000 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define for debugging support */ #undef DEBUG @@ -15,6 +15,14 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT @@ -30,9 +38,6 @@ /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES -/* Define if librsvg-2.0 >= 2.36.2 present */ -#undef HAVE_LIBRSVG_2_36_2 - /* Define if libX11 is available */ #undef HAVE_LIBX11 @@ -63,8 +68,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -Nru xfce4-xkb-plugin-0.7.1/config.sub xfce4-xkb-plugin-0.8.1/config.sub --- xfce4-xkb-plugin-0.7.1/config.sub 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/config.sub 2017-09-08 20:51:36.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2014-07-28' +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-2014 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,15 +254,16 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | 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 \ @@ -301,10 +301,12 @@ | 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 \ @@ -312,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) @@ -326,6 +330,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -371,17 +378,18 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | 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-* \ @@ -422,13 +430,15 @@ | 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*-* \ @@ -436,6 +446,8 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -512,6 +524,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -632,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 @@ -773,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 @@ -924,6 +950,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1008,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-*) @@ -1016,9 +1045,9 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1219,6 +1248,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1364,18 +1396,18 @@ | -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* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1384,7 +1416,8 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1516,6 +1549,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1611,6 +1646,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff -Nru xfce4-xkb-plugin-0.7.1/configure xfce4-xkb-plugin-0.8.1/configure --- xfce4-xkb-plugin-0.7.1/configure 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/configure 2017-09-08 20:51:36.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in ba8007d. +# From configure.ac b34ba90. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xfce4-xkb-plugin 0.7.1. +# Generated by GNU Autoconf 2.69 for xfce4-xkb-plugin 0.8.1. # # Report bugs to . # @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='xfce4-xkb-plugin' PACKAGE_TARNAME='xfce4-xkb-plugin' -PACKAGE_VERSION='0.7.1' -PACKAGE_STRING='xfce4-xkb-plugin 0.7.1' +PACKAGE_VERSION='0.8.1' +PACKAGE_STRING='xfce4-xkb-plugin 0.8.1' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -647,12 +647,6 @@ LIBWNCK_LIBS LIBWNCK_CFLAGS LIBWNCK_VERSION -HAVE_LIBRSVG_2_36_2_FALSE -HAVE_LIBRSVG_2_36_2_TRUE -LIBRSVG_2_36_2_REQUIRED_VERSION -LIBRSVG_2_36_2_LIBS -LIBRSVG_2_36_2_CFLAGS -LIBRSVG_2_36_2_VERSION LIBRSVG_REQUIRED_VERSION LIBRSVG_LIBS LIBRSVG_CFLAGS @@ -661,10 +655,10 @@ LIBXKLAVIER_LIBS LIBXKLAVIER_CFLAGS LIBXKLAVIER_VERSION -LIBXFCE4PANEL_REQUIRED_VERSION -LIBXFCE4PANEL_LIBS -LIBXFCE4PANEL_CFLAGS -LIBXFCE4PANEL_VERSION +XFCONF_REQUIRED_VERSION +XFCONF_LIBS +XFCONF_CFLAGS +XFCONF_VERSION LIBXFCE4UI_REQUIRED_VERSION LIBXFCE4UI_LIBS LIBXFCE4UI_CFLAGS @@ -673,6 +667,10 @@ LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_VERSION +LIBXFCE4PANEL_REQUIRED_VERSION +LIBXFCE4PANEL_LIBS +LIBXFCE4PANEL_CFLAGS +LIBXFCE4PANEL_VERSION GTK_REQUIRED_VERSION GTK_LIBS GTK_CFLAGS @@ -689,9 +687,11 @@ INTLLIBS INSTOBJEXT GMOFILES +DATADIRNAME CATOBJEXT CATALOGS MSGFMT_OPTS +INTL_MACOSX_LIBS GETTEXT_PACKAGE LIBX11_LIBS LIBX11_LDFLAGS @@ -701,6 +701,7 @@ X_PRE_LIBS X_CFLAGS XMKMF +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -717,7 +718,6 @@ ac_ct_DUMPBIN DUMPBIN LIBTOOL -DATADIRNAME ALL_LINGUAS INTLTOOL_PERL GMSGFMT @@ -870,11 +870,11 @@ enable_shared with_pic enable_fast_install +with_aix_soname with_sysroot enable_libtool_lock with_x with_locales_dir -enable_librsvg_2_36_2 enable_debug ' ac_precious_vars='build_alias @@ -886,6 +886,7 @@ LIBS CPPFLAGS CPP +LT_SYS_LIBRARY_PATH XMKMF PKG_CONFIG PKG_CONFIG_PATH @@ -1430,7 +1431,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 xfce4-xkb-plugin 0.7.1 to adapt to many kinds of systems. +\`configure' configures xfce4-xkb-plugin 0.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1506,7 +1507,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-xkb-plugin 0.7.1:";; + short | recursive ) echo "Configuration of xfce4-xkb-plugin 0.8.1:";; esac cat <<\_ACEOF @@ -1529,12 +1530,6 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-librsvg_2.36.2 Enable checking for deprecated includes of librsvg - header files (always leave enabled) - (default=[yes]) - --disable-librsvg_2.36.2 - Disable checking for deprecated includes of librsvg - header files (always leave enabled) --enable-debug[=no|minimum|yes|full] Build with debugging support [default=[]] --disable-debug Include no debugging support @@ -1545,8 +1540,11 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --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-locales-dir=DIR Install locales into DIR @@ -1561,6 +1559,8 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. XMKMF Path to xmkmf, Makefile generator for X Window System PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -1634,7 +1634,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfce4-xkb-plugin configure 0.7.1 +xfce4-xkb-plugin configure 0.8.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2006,7 +2006,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfce4-xkb-plugin $as_me 0.7.1, which was +It was created by xfce4-xkb-plugin $as_me 0.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2496,7 +2496,7 @@ program_prefix=${target_alias}- -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2668,8 +2668,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2688,7 +2688,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'" ;; @@ -2982,7 +2982,7 @@ # Define the identity of the package. PACKAGE='xfce4-xkb-plugin' - VERSION='0.7.1' + VERSION='0.8.1' cat >>confdefs.h <<_ACEOF @@ -3016,8 +3016,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}' @@ -3190,6 +3190,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + ac_config_headers="$ac_config_headers config.h" @@ -3215,6 +3216,45 @@ MAINT=$MAINTAINER_MODE_TRUE +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + DEPDIR="${am__leading_dot}deps" @@ -5704,7 +5744,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 @@ -5730,19 +5770,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` ;; @@ -5756,7 +5796,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. @@ -5767,7 +5807,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 @@ -5778,32 +5818,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; } @@ -5864,16 +5904,16 @@ ;; esac -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 -$as_echo_n "checking for intltool >= ... " >&6; } +if test -n "0.35.0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 +$as_echo_n "checking for intltool >= 0.35.0... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -6378,44 +6418,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - @@ -6428,8 +6430,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -6443,7 +6445,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within # double-quoted strings. @@ -6469,33 +6471,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 @@ -6506,15 +6513,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 : @@ -6620,9 +6627,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=: @@ -6630,8 +6637,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -6682,7 +6689,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -6722,7 +6729,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` @@ -6772,22 +6779,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 @@ -6805,7 +6813,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 @@ -6823,30 +6831,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 @@ -6969,13 +6953,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 @@ -7103,13 +7087,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]*) @@ -7136,8 +7120,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 @@ -7173,10 +7156,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -7215,7 +7194,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 ;; @@ -7237,8 +7216,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)$' @@ -7291,6 +7270,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -7448,8 +7430,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 @@ -7461,7 +7443,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -7615,7 +7597,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 @@ -7623,7 +7605,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 @@ -7636,7 +7618,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 @@ -7853,7 +7835,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -7943,7 +7925,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -7976,14 +7958,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= @@ -8001,21 +8013,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'" @@ -8063,11 +8078,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 @@ -8093,7 +8108,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} }; @@ -8113,13 +8128,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 @@ -8140,7 +8155,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= @@ -8193,6 +8208,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -8205,9 +8230,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 ;; #( @@ -8217,8 +8242,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 @@ -8230,18 +8255,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 @@ -8250,24 +8356,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" @@ -8296,9 +8403,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 @@ -8312,7 +8460,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" @@ -8357,7 +8512,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; } @@ -8397,13 +8552,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 @@ -8415,7 +8571,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*) @@ -8424,7 +8580,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 ;; *) @@ -8440,7 +8596,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. @@ -8551,7 +8707,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 @@ -9054,7 +9210,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 @@ -9072,7 +9228,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 @@ -9111,7 +9267,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 @@ -9140,7 +9296,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 @@ -9153,32 +9309,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= @@ -9186,6 +9342,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 +} + for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default @@ -9213,14 +9404,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 @@ -9251,14 +9442,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 @@ -9283,14 +9474,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 @@ -9298,8 +9489,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -9315,14 +9504,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 @@ -9336,11 +9525,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' @@ -9389,7 +9630,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -9428,7 +9669,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 @@ -9439,14 +9680,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 @@ -9455,15 +9696,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 @@ -9478,22 +9712,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 : @@ -9516,13 +9750,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; } @@ -9544,22 +9778,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 : @@ -9582,13 +9816,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; } @@ -9609,7 +9843,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' @@ -9667,7 +9901,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' ;; @@ -9683,7 +9917,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 @@ -9713,7 +9947,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 : @@ -9731,17 +9965,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*) @@ -9752,8 +9987,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 @@ -9769,6 +10004,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*) @@ -9839,7 +10079,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 @@ -9847,10 +10087,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*) @@ -9866,7 +10125,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*) @@ -9875,9 +10134,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' @@ -9902,6 +10161,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) @@ -9999,7 +10264,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 @@ -10028,7 +10293,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= ;; @@ -10060,7 +10325,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 @@ -10090,7 +10355,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" ;; @@ -10122,7 +10387,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 @@ -10141,13 +10406,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= @@ -10267,8 +10532,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; } @@ -10280,9 +10545,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 @@ -10325,9 +10590,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 @@ -10342,7 +10607,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 ;; @@ -10350,7 +10615,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -10360,7 +10625,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 @@ -10382,24 +10647,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 ... @@ -10412,7 +10677,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 @@ -10431,7 +10696,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) @@ -10447,7 +10712,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 @@ -10457,7 +10722,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 @@ -10465,61 +10730,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' ;; @@ -10530,42 +10823,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 @@ -10579,8 +10877,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 ;; @@ -10598,8 +10896,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 @@ -10611,7 +10909,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 @@ -10626,9 +10924,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 @@ -10645,15 +10943,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= @@ -10669,7 +10967,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 @@ -10677,34 +10975,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 @@ -10723,13 +11044,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 @@ -10748,35 +11077,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 : @@ -10811,7 +11147,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 @@ -10819,17 +11155,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 : @@ -10864,7 +11200,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 @@ -10872,21 +11208,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 ;; @@ -10895,7 +11243,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) @@ -10925,16 +11273,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 @@ -10943,18 +11292,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 @@ -10963,7 +11312,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. @@ -10982,24 +11331,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 @@ -11041,33 +11390,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 @@ -11075,25 +11424,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' ;; *) @@ -11105,7 +11454,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 @@ -11124,14 +11473,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 @@ -11139,8 +11488,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 @@ -11151,7 +11500,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. @@ -11162,8 +11511,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. @@ -11173,8 +11522,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; } @@ -11186,24 +11535,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 @@ -11218,7 +11577,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 ;; @@ -11226,27 +11585,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 @@ -11257,33 +11608,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' @@ -11294,24 +11665,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 @@ -11321,11 +11692,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 @@ -11335,10 +11706,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 @@ -11387,43 +11758,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 ;; @@ -11438,10 +11809,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 @@ -11449,7 +11820,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 @@ -11475,7 +11846,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. @@ -11690,14 +12061,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 @@ -11713,28 +12084,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--; } @@ -11748,7 +12126,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 @@ -11757,7 +12135,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11774,14 +12152,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]*) @@ -11789,41 +12169,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 ;; @@ -11833,18 +12263,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 ;; @@ -11852,8 +12282,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" @@ -11865,7 +12295,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -11874,8 +12304,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~ @@ -11891,17 +12321,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' @@ -11910,8 +12340,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*) @@ -11938,7 +12368,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'` @@ -11951,8 +12381,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' @@ -11965,7 +12395,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 @@ -11978,8 +12408,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`' @@ -11992,8 +12422,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 ;; @@ -12011,12 +12441,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 @@ -12041,26 +12472,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 ;; @@ -12078,14 +12498,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' @@ -12093,8 +12514,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 ;; @@ -12103,8 +12524,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, ... @@ -12117,8 +12538,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 @@ -12129,7 +12550,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 @@ -12137,8 +12558,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= @@ -12157,8 +12578,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 ;; @@ -12167,13 +12588,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 @@ -12217,14 +12658,15 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12241,12 +12683,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 @@ -12256,7 +12698,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 ;; @@ -12265,58 +12707,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*) @@ -12327,8 +12779,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 @@ -12338,11 +12790,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 @@ -12350,8 +12802,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) @@ -12372,24 +12824,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' @@ -12407,7 +12859,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 @@ -12415,8 +12867,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 ;; @@ -12426,20 +12878,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 + + + + + + @@ -12536,15 +13003,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 @@ -12559,12 +13026,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 @@ -12574,7 +13041,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 @@ -12584,23 +13051,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 : @@ -12638,10 +13105,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 @@ -12649,10 +13116,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; } @@ -12691,11 +13166,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; } @@ -12734,7 +13209,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; } @@ -12773,7 +13248,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; } @@ -12812,7 +13287,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 @@ -12833,21 +13308,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 @@ -12855,7 +13330,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 @@ -12902,9 +13377,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 @@ -12934,7 +13409,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 @@ -12954,14 +13429,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 @@ -13008,9 +13483,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 @@ -13040,7 +13515,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 @@ -13061,9 +13536,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 @@ -13107,7 +13582,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 @@ -13135,7 +13610,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 @@ -13143,13 +13618,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' @@ -13157,8 +13632,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 @@ -13168,7 +13647,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; } @@ -13182,7 +13661,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -14086,7 +14565,7 @@ - ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl oc pl pt_BR pt ro ru sk sq sr sv th tr ug uk ur_PK ur uz@Latn uz zh_CN zh_TW " + ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl oc pl pt_BR pt ro ru sk sl sq sr sv th tr ug uk ur_PK ur uz@Latn uz zh_CN zh_TW " for ac_header in locale.h do : @@ -14142,6 +14621,82 @@ XGETTEXT=: INTLLIBS= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFLocaleCopyCurrent(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyCurrent=yes +else + gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" @@ -14482,7 +15037,7 @@ fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -14974,26 +15529,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.6.0" >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.6.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.6.0" "gtk+-2.0" >/dev/null 2>&1; then - GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.20.0" >&5 +$as_echo_n "checking for gtk+-3.0 >= 3.20.0... " >&6; } + if $PKG_CONFIG "--atleast-version=3.20.0" "gtk+-3.0" >/dev/null 2>&1; then + GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5 $as_echo "$GTK_VERSION" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 $as_echo_n "checking GTK_CFLAGS... " >&6; } - GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` + GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 $as_echo "$GTK_CFLAGS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 $as_echo_n "checking GTK_LIBS... " >&6; } - GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` + GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 $as_echo "$GTK_LIBS" >&6; } - GTK_REQUIRED_VERSION=2.6.0 + GTK_REQUIRED_VERSION=3.20.0 @@ -15001,15 +15556,15 @@ - elif $PKG_CONFIG --exists "gtk+-2.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-2.0"` + elif $PKG_CONFIG --exists "gtk+-3.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package gtk+-2.0 was found on your system," + echo "*** The required package gtk+-3.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gtk+-2.0 to atleast version 2.6.0, or adjust" + echo "*** Please upgrade gtk+-3.0 to atleast version 3.20.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15020,8 +15575,8 @@ $as_echo "not found" >&6; } - echo "*** The required package gtk+-2.0 was not found on your system." - echo "*** Please install gtk+-2.0 (atleast version 2.6.0) or adjust" + echo "*** The required package gtk+-3.0 was not found on your system." + echo "*** Please install gtk+-3.0 (atleast version 3.20.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15169,26 +15724,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.8.0" >&5 -$as_echo_n "checking for libxfce4util-1.0 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4util-1.0" >/dev/null 2>&1; then - LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 -$as_echo "$LIBXFCE4UTIL_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4panel-2.0 >= 4.12.0" >&5 +$as_echo_n "checking for libxfce4panel-2.0 >= 4.12.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.12.0" "libxfce4panel-2.0" >/dev/null 2>&1; then + LIBXFCE4PANEL_VERSION=`$PKG_CONFIG --modversion "libxfce4panel-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_VERSION" >&5 +$as_echo "$LIBXFCE4PANEL_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 -$as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } - LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 -$as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4PANEL_CFLAGS" >&5 +$as_echo_n "checking LIBXFCE4PANEL_CFLAGS... " >&6; } + LIBXFCE4PANEL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4panel-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_CFLAGS" >&5 +$as_echo "$LIBXFCE4PANEL_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 -$as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } - LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 -$as_echo "$LIBXFCE4UTIL_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4PANEL_LIBS" >&5 +$as_echo_n "checking LIBXFCE4PANEL_LIBS... " >&6; } + LIBXFCE4PANEL_LIBS=`$PKG_CONFIG --libs "libxfce4panel-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_LIBS" >&5 +$as_echo "$LIBXFCE4PANEL_LIBS" >&6; } - LIBXFCE4UTIL_REQUIRED_VERSION=4.8.0 + LIBXFCE4PANEL_REQUIRED_VERSION=4.12.0 @@ -15196,15 +15751,15 @@ - elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` + elif $PKG_CONFIG --exists "libxfce4panel-2.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4panel-2.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package libxfce4util-1.0 was found on your system," + echo "*** The required package libxfce4panel-2.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.8.0, or adjust" + echo "*** Please upgrade libxfce4panel-2.0 to atleast version 4.12.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15215,8 +15770,8 @@ $as_echo "not found" >&6; } - echo "*** The required package libxfce4util-1.0 was not found on your system." - echo "*** Please install libxfce4util-1.0 (atleast version 4.8.0) or adjust" + echo "*** The required package libxfce4panel-2.0 was not found on your system." + echo "*** Please install libxfce4panel-2.0 (atleast version 4.12.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15364,26 +15919,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-1 >= 4.8.0" >&5 -$as_echo_n "checking for libxfce4ui-1 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4ui-1" >/dev/null 2>&1; then - LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-1"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 -$as_echo "$LIBXFCE4UI_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.12.0" >&5 +$as_echo_n "checking for libxfce4util-1.0 >= 4.12.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.12.0" "libxfce4util-1.0" >/dev/null 2>&1; then + LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 +$as_echo "$LIBXFCE4UTIL_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_CFLAGS" >&5 -$as_echo_n "checking LIBXFCE4UI_CFLAGS... " >&6; } - LIBXFCE4UI_CFLAGS=`$PKG_CONFIG --cflags "libxfce4ui-1"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_CFLAGS" >&5 -$as_echo "$LIBXFCE4UI_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 +$as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } + LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 +$as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_LIBS" >&5 -$as_echo_n "checking LIBXFCE4UI_LIBS... " >&6; } - LIBXFCE4UI_LIBS=`$PKG_CONFIG --libs "libxfce4ui-1"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 -$as_echo "$LIBXFCE4UI_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 +$as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } + LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 +$as_echo "$LIBXFCE4UTIL_LIBS" >&6; } - LIBXFCE4UI_REQUIRED_VERSION=4.8.0 + LIBXFCE4UTIL_REQUIRED_VERSION=4.12.0 @@ -15391,15 +15946,15 @@ - elif $PKG_CONFIG --exists "libxfce4ui-1" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4ui-1"` + elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package libxfce4ui-1 was found on your system," + echo "*** The required package libxfce4util-1.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfce4ui-1 to atleast version 4.8.0, or adjust" + echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.12.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15410,8 +15965,8 @@ $as_echo "not found" >&6; } - echo "*** The required package libxfce4ui-1 was not found on your system." - echo "*** Please install libxfce4ui-1 (atleast version 4.8.0) or adjust" + echo "*** The required package libxfce4util-1.0 was not found on your system." + echo "*** Please install libxfce4util-1.0 (atleast version 4.12.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15559,26 +16114,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4panel-1.0 >= 4.8.0" >&5 -$as_echo_n "checking for libxfce4panel-1.0 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4panel-1.0" >/dev/null 2>&1; then - LIBXFCE4PANEL_VERSION=`$PKG_CONFIG --modversion "libxfce4panel-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_VERSION" >&5 -$as_echo "$LIBXFCE4PANEL_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-2 >= 4.12.0" >&5 +$as_echo_n "checking for libxfce4ui-2 >= 4.12.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.12.0" "libxfce4ui-2" >/dev/null 2>&1; then + LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-2"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 +$as_echo "$LIBXFCE4UI_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4PANEL_CFLAGS" >&5 -$as_echo_n "checking LIBXFCE4PANEL_CFLAGS... " >&6; } - LIBXFCE4PANEL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4panel-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_CFLAGS" >&5 -$as_echo "$LIBXFCE4PANEL_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_CFLAGS" >&5 +$as_echo_n "checking LIBXFCE4UI_CFLAGS... " >&6; } + LIBXFCE4UI_CFLAGS=`$PKG_CONFIG --cflags "libxfce4ui-2"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_CFLAGS" >&5 +$as_echo "$LIBXFCE4UI_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4PANEL_LIBS" >&5 -$as_echo_n "checking LIBXFCE4PANEL_LIBS... " >&6; } - LIBXFCE4PANEL_LIBS=`$PKG_CONFIG --libs "libxfce4panel-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_LIBS" >&5 -$as_echo "$LIBXFCE4PANEL_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_LIBS" >&5 +$as_echo_n "checking LIBXFCE4UI_LIBS... " >&6; } + LIBXFCE4UI_LIBS=`$PKG_CONFIG --libs "libxfce4ui-2"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 +$as_echo "$LIBXFCE4UI_LIBS" >&6; } - LIBXFCE4PANEL_REQUIRED_VERSION=4.8.0 + LIBXFCE4UI_REQUIRED_VERSION=4.12.0 @@ -15586,15 +16141,15 @@ - elif $PKG_CONFIG --exists "libxfce4panel-1.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4panel-1.0"` + elif $PKG_CONFIG --exists "libxfce4ui-2" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4ui-2"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package libxfce4panel-1.0 was found on your system," + echo "*** The required package libxfce4ui-2 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfce4panel-1.0 to atleast version 4.8.0, or adjust" + echo "*** Please upgrade libxfce4ui-2 to atleast version 4.12.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15605,8 +16160,8 @@ $as_echo "not found" >&6; } - echo "*** The required package libxfce4panel-1.0 was not found on your system." - echo "*** Please install libxfce4panel-1.0 (atleast version 4.8.0) or adjust" + echo "*** The required package libxfce4ui-2 was not found on your system." + echo "*** Please install libxfce4ui-2 (atleast version 4.12.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15754,26 +16309,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxklavier >= 5.0" >&5 -$as_echo_n "checking for libxklavier >= 5.0... " >&6; } - if $PKG_CONFIG "--atleast-version=5.0" "libxklavier" >/dev/null 2>&1; then - LIBXKLAVIER_VERSION=`$PKG_CONFIG --modversion "libxklavier"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXKLAVIER_VERSION" >&5 -$as_echo "$LIBXKLAVIER_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.12.1" >&5 +$as_echo_n "checking for libxfconf-0 >= 4.12.1... " >&6; } + if $PKG_CONFIG "--atleast-version=4.12.1" "libxfconf-0" >/dev/null 2>&1; then + XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 +$as_echo "$XFCONF_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXKLAVIER_CFLAGS" >&5 -$as_echo_n "checking LIBXKLAVIER_CFLAGS... " >&6; } - LIBXKLAVIER_CFLAGS=`$PKG_CONFIG --cflags "libxklavier"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXKLAVIER_CFLAGS" >&5 -$as_echo "$LIBXKLAVIER_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_CFLAGS" >&5 +$as_echo_n "checking XFCONF_CFLAGS... " >&6; } + XFCONF_CFLAGS=`$PKG_CONFIG --cflags "libxfconf-0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_CFLAGS" >&5 +$as_echo "$XFCONF_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXKLAVIER_LIBS" >&5 -$as_echo_n "checking LIBXKLAVIER_LIBS... " >&6; } - LIBXKLAVIER_LIBS=`$PKG_CONFIG --libs "libxklavier"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXKLAVIER_LIBS" >&5 -$as_echo "$LIBXKLAVIER_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFCONF_LIBS" >&5 +$as_echo_n "checking XFCONF_LIBS... " >&6; } + XFCONF_LIBS=`$PKG_CONFIG --libs "libxfconf-0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 +$as_echo "$XFCONF_LIBS" >&6; } - LIBXKLAVIER_REQUIRED_VERSION=5.0 + XFCONF_REQUIRED_VERSION=4.12.1 @@ -15781,15 +16336,15 @@ - elif $PKG_CONFIG --exists "libxklavier" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libxklavier"` + elif $PKG_CONFIG --exists "libxfconf-0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxfconf-0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package libxklavier was found on your system," + echo "*** The required package libxfconf-0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxklavier to atleast version 5.0, or adjust" + echo "*** Please upgrade libxfconf-0 to atleast version 4.12.1, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15800,8 +16355,8 @@ $as_echo "not found" >&6; } - echo "*** The required package libxklavier was not found on your system." - echo "*** Please install libxklavier (atleast version 5.0) or adjust" + echo "*** The required package libxfconf-0 was not found on your system." + echo "*** Please install libxfconf-0 (atleast version 4.12.1) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15949,26 +16504,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.18" >&5 -$as_echo_n "checking for librsvg-2.0 >= 2.18... " >&6; } - if $PKG_CONFIG "--atleast-version=2.18" "librsvg-2.0" >/dev/null 2>&1; then - LIBRSVG_VERSION=`$PKG_CONFIG --modversion "librsvg-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_VERSION" >&5 -$as_echo "$LIBRSVG_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxklavier >= 5.4" >&5 +$as_echo_n "checking for libxklavier >= 5.4... " >&6; } + if $PKG_CONFIG "--atleast-version=5.4" "libxklavier" >/dev/null 2>&1; then + LIBXKLAVIER_VERSION=`$PKG_CONFIG --modversion "libxklavier"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXKLAVIER_VERSION" >&5 +$as_echo "$LIBXKLAVIER_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRSVG_CFLAGS" >&5 -$as_echo_n "checking LIBRSVG_CFLAGS... " >&6; } - LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_CFLAGS" >&5 -$as_echo "$LIBRSVG_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXKLAVIER_CFLAGS" >&5 +$as_echo_n "checking LIBXKLAVIER_CFLAGS... " >&6; } + LIBXKLAVIER_CFLAGS=`$PKG_CONFIG --cflags "libxklavier"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXKLAVIER_CFLAGS" >&5 +$as_echo "$LIBXKLAVIER_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRSVG_LIBS" >&5 -$as_echo_n "checking LIBRSVG_LIBS... " >&6; } - LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_LIBS" >&5 -$as_echo "$LIBRSVG_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXKLAVIER_LIBS" >&5 +$as_echo_n "checking LIBXKLAVIER_LIBS... " >&6; } + LIBXKLAVIER_LIBS=`$PKG_CONFIG --libs "libxklavier"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXKLAVIER_LIBS" >&5 +$as_echo "$LIBXKLAVIER_LIBS" >&6; } - LIBRSVG_REQUIRED_VERSION=2.18 + LIBXKLAVIER_REQUIRED_VERSION=5.4 @@ -15976,15 +16531,15 @@ - elif $PKG_CONFIG --exists "librsvg-2.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "librsvg-2.0"` + elif $PKG_CONFIG --exists "libxklavier" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxklavier"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package librsvg-2.0 was found on your system," + echo "*** The required package libxklavier was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade librsvg-2.0 to atleast version 2.18, or adjust" + echo "*** Please upgrade libxklavier to atleast version 5.4, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15995,8 +16550,8 @@ $as_echo "not found" >&6; } - echo "*** The required package librsvg-2.0 was not found on your system." - echo "*** Please install librsvg-2.0 (atleast version 2.18) or adjust" + echo "*** The required package libxklavier was not found on your system." + echo "*** Please install libxklavier (atleast version 5.4) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -16006,19 +16561,6 @@ - - # Check whether --enable-librsvg_2.36.2 was given. -if test "${enable_librsvg_2_36_2+set}" = set; then : - enableval=$enable_librsvg_2_36_2; xdt_cv_LIBRSVG_2_36_2_check=$enableval -else - xdt_cv_LIBRSVG_2_36_2_check=yes -fi - - - if test x"$xdt_cv_LIBRSVG_2_36_2_check" = x"yes"; then - if $PKG_CONFIG --exists "librsvg-2.0 >= 2.36.2" >/dev/null 2>&1; then - - # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 @@ -16157,37 +16699,32 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.36.2" >&5 -$as_echo_n "checking for librsvg-2.0 >= 2.36.2... " >&6; } - if $PKG_CONFIG "--atleast-version=2.36.2" "librsvg-2.0" >/dev/null 2>&1; then - LIBRSVG_2_36_2_VERSION=`$PKG_CONFIG --modversion "librsvg-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_2_36_2_VERSION" >&5 -$as_echo "$LIBRSVG_2_36_2_VERSION" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRSVG_2_36_2_CFLAGS" >&5 -$as_echo_n "checking LIBRSVG_2_36_2_CFLAGS... " >&6; } - LIBRSVG_2_36_2_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_2_36_2_CFLAGS" >&5 -$as_echo "$LIBRSVG_2_36_2_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRSVG_2_36_2_LIBS" >&5 -$as_echo_n "checking LIBRSVG_2_36_2_LIBS... " >&6; } - LIBRSVG_2_36_2_LIBS=`$PKG_CONFIG --libs "librsvg-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_2_36_2_LIBS" >&5 -$as_echo "$LIBRSVG_2_36_2_LIBS" >&6; } - - LIBRSVG_2_36_2_REQUIRED_VERSION=2.36.2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.40" >&5 +$as_echo_n "checking for librsvg-2.0 >= 2.40... " >&6; } + if $PKG_CONFIG "--atleast-version=2.40" "librsvg-2.0" >/dev/null 2>&1; then + LIBRSVG_VERSION=`$PKG_CONFIG --modversion "librsvg-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_VERSION" >&5 +$as_echo "$LIBRSVG_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRSVG_CFLAGS" >&5 +$as_echo_n "checking LIBRSVG_CFLAGS... " >&6; } + LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_CFLAGS" >&5 +$as_echo "$LIBRSVG_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRSVG_LIBS" >&5 +$as_echo_n "checking LIBRSVG_LIBS... " >&6; } + LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRSVG_LIBS" >&5 +$as_echo "$LIBRSVG_LIBS" >&6; } + LIBRSVG_REQUIRED_VERSION=2.40 -$as_echo "#define HAVE_LIBRSVG_2_36_2 1" >>confdefs.h - LIBRSVG_2_36_2_FOUND="yes" elif $PKG_CONFIG --exists "librsvg-2.0" >/dev/null 2>&1; then xdt_cv_version=`$PKG_CONFIG --modversion "librsvg-2.0"` @@ -16197,7 +16734,7 @@ echo "*** The required package librsvg-2.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade librsvg-2.0 to atleast version 2.36.2, or adjust" + echo "*** Please upgrade librsvg-2.0 to atleast version 2.40, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -16209,7 +16746,7 @@ echo "*** The required package librsvg-2.0 was not found on your system." - echo "*** Please install librsvg-2.0 (atleast version 2.36.2) or adjust" + echo "*** Please install librsvg-2.0 (atleast version 2.40) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -16217,28 +16754,6 @@ fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package librsvg-2.0 >= 2.36.2" >&5 -$as_echo_n "checking for optional package librsvg-2.0 >= 2.36.2... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package librsvg-2.0" >&5 -$as_echo_n "checking for optional package librsvg-2.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } - fi - - if test x"$LIBRSVG_2_36_2_FOUND" = x"yes"; then - HAVE_LIBRSVG_2_36_2_TRUE= - HAVE_LIBRSVG_2_36_2_FALSE='#' -else - HAVE_LIBRSVG_2_36_2_TRUE='#' - HAVE_LIBRSVG_2_36_2_FALSE= -fi - - # minimum supported version of pkg-config @@ -16379,26 +16894,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwnck-1.0 >= 2.12" >&5 -$as_echo_n "checking for libwnck-1.0 >= 2.12... " >&6; } - if $PKG_CONFIG "--atleast-version=2.12" "libwnck-1.0" >/dev/null 2>&1; then - LIBWNCK_VERSION=`$PKG_CONFIG --modversion "libwnck-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwnck-3.0 >= 3.14" >&5 +$as_echo_n "checking for libwnck-3.0 >= 3.14... " >&6; } + if $PKG_CONFIG "--atleast-version=3.14" "libwnck-3.0" >/dev/null 2>&1; then + LIBWNCK_VERSION=`$PKG_CONFIG --modversion "libwnck-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWNCK_VERSION" >&5 $as_echo "$LIBWNCK_VERSION" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWNCK_CFLAGS" >&5 $as_echo_n "checking LIBWNCK_CFLAGS... " >&6; } - LIBWNCK_CFLAGS=`$PKG_CONFIG --cflags "libwnck-1.0"` + LIBWNCK_CFLAGS=`$PKG_CONFIG --cflags "libwnck-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWNCK_CFLAGS" >&5 $as_echo "$LIBWNCK_CFLAGS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWNCK_LIBS" >&5 $as_echo_n "checking LIBWNCK_LIBS... " >&6; } - LIBWNCK_LIBS=`$PKG_CONFIG --libs "libwnck-1.0"` + LIBWNCK_LIBS=`$PKG_CONFIG --libs "libwnck-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWNCK_LIBS" >&5 $as_echo "$LIBWNCK_LIBS" >&6; } - LIBWNCK_REQUIRED_VERSION=2.12 + LIBWNCK_REQUIRED_VERSION=3.14 @@ -16406,15 +16921,15 @@ - elif $PKG_CONFIG --exists "libwnck-1.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libwnck-1.0"` + elif $PKG_CONFIG --exists "libwnck-3.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libwnck-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package libwnck-1.0 was found on your system," + echo "*** The required package libwnck-3.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libwnck-1.0 to atleast version 2.12, or adjust" + echo "*** Please upgrade libwnck-3.0 to atleast version 3.14, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -16425,8 +16940,8 @@ $as_echo "not found" >&6; } - echo "*** The required package libwnck-1.0 was not found on your system." - echo "*** Please install libwnck-1.0 (atleast version 2.12) or adjust" + echo "*** The required package libwnck-3.0 was not found on your system." + echo "*** Please install libwnck-3.0 (atleast version 3.14) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -16574,9 +17089,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for garcon-1 >= 0.1.5" >&5 -$as_echo_n "checking for garcon-1 >= 0.1.5... " >&6; } - if $PKG_CONFIG "--atleast-version=0.1.5" "garcon-1" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for garcon-1 >= 0.4.0" >&5 +$as_echo_n "checking for garcon-1 >= 0.4.0... " >&6; } + if $PKG_CONFIG "--atleast-version=0.4.0" "garcon-1" >/dev/null 2>&1; then GARCON_VERSION=`$PKG_CONFIG --modversion "garcon-1"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GARCON_VERSION" >&5 $as_echo "$GARCON_VERSION" >&6; } @@ -16593,7 +17108,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GARCON_LIBS" >&5 $as_echo "$GARCON_LIBS" >&6; } - GARCON_REQUIRED_VERSION=0.1.5 + GARCON_REQUIRED_VERSION=0.4.0 @@ -16609,7 +17124,7 @@ echo "*** The required package garcon-1 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade garcon-1 to atleast version 0.1.5, or adjust" + echo "*** Please upgrade garcon-1 to atleast version 0.4.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -16621,7 +17136,7 @@ echo "*** The required package garcon-1 was not found on your system." - echo "*** Please install garcon-1 (atleast version 0.1.5) or adjust" + echo "*** Please install garcon-1 (atleast version 0.4.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -16653,9 +17168,9 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs" + -Wnested-externs" CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then @@ -16876,10 +17391,6 @@ ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${HAVE_LIBRSVG_2_36_2_TRUE}" && test -z "${HAVE_LIBRSVG_2_36_2_FALSE}"; then - as_fn_error $? "conditional \"HAVE_LIBRSVG_2_36_2\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -17277,7 +17788,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfce4-xkb-plugin $as_me 0.7.1, which was +This file was extended by xfce4-xkb-plugin $as_me 0.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17343,7 +17854,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xfce4-xkb-plugin config.status 0.7.1 +xfce4-xkb-plugin config.status 0.8.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17486,6 +17997,7 @@ enable_shared='`$ECHO "$enable_shared" | $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"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' @@ -17527,10 +18039,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"`' @@ -17595,7 +18110,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"`' @@ -17646,9 +18162,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 \ @@ -17683,7 +18202,7 @@ striplib; 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\\\\\\"" @@ -17710,10 +18229,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; 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\\\\\\"" @@ -17722,19 +18242,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' @@ -18449,55 +18966,53 @@ ;; "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 +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# 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="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -18538,6 +19053,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 + # The PATH separator for the build system. PATH_SEPARATOR=$lt_PATH_SEPARATOR @@ -18634,18 +19152,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 @@ -18736,8 +19263,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 @@ -18830,13 +19360,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 @@ -18888,13 +19418,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 @@ -18903,7 +19492,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 @@ -18913,165 +19502,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" diff -Nru xfce4-xkb-plugin-0.7.1/configure.ac xfce4-xkb-plugin-0.8.1/configure.ac --- xfce4-xkb-plugin-0.7.1/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/configure.ac 2017-09-08 20:51:33.000000000 +0000 @@ -0,0 +1,108 @@ +dnl +dnl This file was autogenerated from "configure.ac.in". +dnl Edit that file instead! +dnl + +dnl configure.ac +dnl +dnl xfce4-xkb-plugin - XKB plugin for xfce4-panel +dnl +dnl 2003 Benedikt Meurer +dnl + +AC_CONFIG_MACRO_DIR([m4]) + +dnl *************************** +dnl *** Version information *** +dnl *************************** +m4_define([xkb_version_major], [0]) +m4_define([xkb_version_minor], [8]) +m4_define([xkb_version_micro], [1]) +m4_define([xkb_version_nano], []) +m4_define([xkb_version_build], [b34ba90]) +m4_define([xkb_version_tag], []) +m4_define([xkb_version], [xkb_version_major().xkb_version_minor().xkb_version_micro()ifelse(xkb_version_nano(), [], [], [.xkb_version_nano()])ifelse(xkb_version_tag(), [git], [xkb_version_tag()-xkb_version_build()], [xkb_version_tag()])]) + +dnl *************************** +dnl *** Initialize autoconf *** +dnl *************************** +AC_COPYRIGHT([Copyright (c) 2006-2013 + The Xfce development team. All rights reserved.]) +AC_INIT([xfce4-xkb-plugin], [xkb_version], [http://bugzilla.xfce.org/], [xfce4-xkb-plugin]) +AC_PREREQ([2.50]) +AC_CANONICAL_TARGET() +AC_REVISION([b34ba90]) + +dnl *************************** +dnl *** Initialize automake *** +dnl *************************** +AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) +AM_CONFIG_HEADER([config.h]) +AM_MAINTAINER_MODE() +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl ******************************* +dnl *** Check for UNIX variants *** +dnl ******************************* +AC_AIX() +AC_ISC_POSIX() +AC_MINIX() +AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""]) + +dnl ******************************** +dnl *** Check for basic programs *** +dnl ******************************** +AC_PROG_CC() +AC_PROG_LD() +AC_PROG_INSTALL() +IT_PROG_INTLTOOL([0.35.0]) +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) +AM_PROG_CC_C_O() + +dnl Check for standard header files +AC_HEADER_STDC + +dnl ********************* +dnl *** Check for X11 *** +dnl ********************* +XDT_CHECK_LIBX11_REQUIRE() + +dnl ****************************** +dnl *** Check for i18n support *** +dnl ****************************** +XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl oc pl pt_BR pt ro ru sk sl sq sr sv th tr ug uk ur_PK ur uz@Latn uz zh_CN zh_TW ]) + +dnl *********************************** +dnl *** Check for required packages *** +dnl *********************************** +XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) +XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.1]) +XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [5.4]) +XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.40]) +XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [3.14]) +XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.4.0]) + +dnl *********************************** +dnl *** Check for debugging support *** +dnl *********************************** +XDT_FEATURE_DEBUG() + +AC_OUTPUT([ +panel-plugin/Makefile +flags/Makefile +Makefile +po/Makefile.in +]) + +dnl *************************** +dnl *** Print configuration *** +dnl *************************** +echo +echo "Build Configuration:" +echo +echo "* Debug Support: $enable_debug" +echo diff -Nru xfce4-xkb-plugin-0.7.1/configure.in xfce4-xkb-plugin-0.8.1/configure.in --- xfce4-xkb-plugin-0.7.1/configure.in 2015-02-27 23:38:54.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -dnl -dnl This file was autogenerated from "configure.in.in". -dnl Edit that file instead! -dnl - -dnl configure.ac -dnl -dnl xfce4-xkb-plugin - XKB plugin for xfce4-panel -dnl -dnl 2003 Benedikt Meurer -dnl - -AC_CONFIG_MACRO_DIR([m4]) - -dnl *************************** -dnl *** Version information *** -dnl *************************** -m4_define([xkb_version_major], [0]) -m4_define([xkb_version_minor], [7]) -m4_define([xkb_version_micro], [1]) -m4_define([xkb_version_nano], []) -m4_define([xkb_version_build], [ba8007d]) -m4_define([xkb_version_tag], []) -m4_define([xkb_version], [xkb_version_major().xkb_version_minor().xkb_version_micro()ifelse(xkb_version_nano(), [], [], [.xkb_version_nano()])ifelse(xkb_version_tag(), [git], [xkb_version_tag()-xkb_version_build()], [xkb_version_tag()])]) - -dnl *************************** -dnl *** Initialize autoconf *** -dnl *************************** -AC_COPYRIGHT([Copyright (c) 2006-2013 - The Xfce development team. All rights reserved.]) -AC_INIT([xfce4-xkb-plugin], [xkb_version], [http://bugzilla.xfce.org/], [xfce4-xkb-plugin]) -AC_PREREQ([2.50]) -AC_CANONICAL_TARGET() -AC_REVISION([ba8007d]) - -dnl *************************** -dnl *** Initialize automake *** -dnl *************************** -AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) -AM_CONFIG_HEADER([config.h]) -AM_MAINTAINER_MODE() - -dnl ******************************* -dnl *** Check for UNIX variants *** -dnl ******************************* -AC_AIX() -AC_ISC_POSIX() -AC_MINIX() -AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""]) - -dnl ******************************** -dnl *** Check for basic programs *** -dnl ******************************** -AC_PROG_CC() -AC_PROG_LD() -AC_PROG_INSTALL() -AC_PROG_INTLTOOL() -LT_PREREQ([2.2.6]) -LT_INIT([disable-static]) -AM_PROG_CC_C_O() - -dnl Check for standard header files -AC_HEADER_STDC - -dnl ********************* -dnl *** Check for X11 *** -dnl ********************* -XDT_CHECK_LIBX11_REQUIRE() - -dnl ****************************** -dnl *** Check for i18n support *** -dnl ****************************** -XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl oc pl pt_BR pt ro ru sk sq sr sv th tr ug uk ur_PK ur uz@Latn uz zh_CN zh_TW ]) - -dnl *********************************** -dnl *** Check for required packages *** -dnl *********************************** -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0]) -XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [5.0]) -XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.18]) -dnl check librsvg version to see if including headers other than rsvg.h is deprecated -XDT_CHECK_OPTIONAL_PACKAGE([LIBRSVG_2_36_2], [librsvg-2.0], [2.36.2], [librsvg_2.36.2], [deprecated includes of librsvg header files (always leave enabled)], yes) -XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12]) -XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.5]) - -dnl *********************************** -dnl *** Check for debugging support *** -dnl *********************************** -XDT_FEATURE_DEBUG() - -AC_OUTPUT([ -panel-plugin/Makefile -flags/Makefile -Makefile -po/Makefile.in -]) - -dnl *************************** -dnl *** Print configuration *** -dnl *************************** -echo -echo "Build Configuration:" -echo -echo "* Debug Support: $enable_debug" -echo diff -Nru xfce4-xkb-plugin-0.7.1/debian/changelog xfce4-xkb-plugin-0.8.1/debian/changelog --- xfce4-xkb-plugin-0.7.1/debian/changelog 2015-05-06 21:12:23.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/debian/changelog 2017-12-17 15:41:46.000000000 +0000 @@ -1,3 +1,33 @@ +xfce4-xkb-plugin (1:0.8.1-1) unstable; urgency=medium + + [ Unit 193 ] + * New upstream release. + - Drop patch no longer needed. + * Run wrap-and-sort. + * d/control: + - Update build-depends for GTK3 version. + + libgtk2.0-dev → libgtk-3-dev + + libwnck-dev → libwnck-3-dev + + libxfce4ui-1-dev → libxfce4ui-2-dev + + xfce4-panel-dev → libxfce4panel-2.0-dev + - Add build-depends on libxfce4util-dev and libxfconf-0-dev. + - Drop versioned build-dep on libxklavier-dev and libgarcon-1-0-dev + - Drop build-depends on libxml-parser-perl and dpkg-dev. + - Use https in Vcs-Browser field. + - Update homepage as listed in the plugin. + - Update Standards-Version to 4.1.2. + * d/rules: Use pkg-info.mk and DEB_SOURCE to remove 'la' files. + * d/p/debian/patches/missing_linker_x11.patch: + - Backport patch to work around a FTBFS by adding -lX11 to LDFLAGS. + * d/changelog: + - Remove trailing whitespace from old entries. + + [ Yves-Alexis Perez ] + * debian/copyright: + - drop obsolete URL. + + -- Yves-Alexis Perez Sun, 17 Dec 2017 16:41:46 +0100 + xfce4-xkb-plugin (1:0.7.1-2) unstable; urgency=medium * Upload to unstable. @@ -42,7 +72,7 @@ * New upstream release. * debian/control: - add build-dep on libgarcon-1-0-dev. - - update standards version to 3.9.3. + - update standards version to 3.9.3. -- Yves-Alexis Perez Wed, 22 May 2013 22:20:28 +0200 @@ -83,7 +113,7 @@ * New upstream release. * debian/patches: - - 01_xklavier_4.0, 02_fix-various-segfaults and 03_xklavier_5.0 dropped, + - 01_xklavier_4.0, 02_fix-various-segfaults and 03_xklavier_5.0 dropped, included upstream. * debian/control: - switch libxfcegui4 build-dep to libxfce4ui now that the plugin has been @@ -180,7 +210,7 @@ - add build-dep on libxklavier12-dev, librsvg2-dev, libwnck-dev, intltool. - add dep on ${misc:Depends}. - * debian/copyright: update dates and copyright owners. + * debian/copyright: update dates and copyright owners. -- Yves-Alexis Perez Sun, 22 Feb 2009 19:45:42 +0100 diff -Nru xfce4-xkb-plugin-0.7.1/debian/control xfce4-xkb-plugin-0.8.1/debian/control --- xfce4-xkb-plugin-0.7.1/debian/control 2015-03-15 21:20:14.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/debian/control 2017-12-17 15:41:44.000000000 +0000 @@ -3,23 +3,30 @@ Priority: optional Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , - Lionel Le Folgoc -Build-Depends: debhelper (>= 9), libgtk2.0-dev, dpkg-dev (>= 1.16.1), - libxfce4ui-1-dev (>= 4.8.0), xfce4-panel-dev (>= 4.8.0), libxml-parser-perl, - libxklavier-dev (>= 5.0), librsvg2-dev, libwnck-dev, intltool, - libgarcon-1-0-dev (>= 0.1.5) -Standards-Version: 3.9.6 -Homepage: http://goodies.xfce.org/ + Lionel Le Folgoc +Build-Depends: debhelper (>= 9), + intltool, + libgarcon-1-0-dev, + libgtk-3-dev, + librsvg2-dev, + libwnck-3-dev, + libxfce4panel-2.0-dev, + libxfce4ui-2-dev, + libxfce4util-dev, + libxfconf-0-dev, + libxklavier-dev +Standards-Version: 4.1.2 +Homepage: https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/ +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/ Package: xfce4-xkb-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: xkb layout switch plugin for the Xfce4 panel The xkb plugin shows you the current keyboard layout and allows you to switch to different defined layouts. . The plugin itself cannot be used for defining the keyboard - layouts one wants to use, this is done the XKB way - either + layouts one wants to use, this is done the XKB way - either in your X config or by setxkbmap tool. diff -Nru xfce4-xkb-plugin-0.7.1/debian/copyright xfce4-xkb-plugin-0.8.1/debian/copyright --- xfce4-xkb-plugin-0.7.1/debian/copyright 2008-09-23 22:27:34.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/debian/copyright 2017-12-17 15:38:23.000000000 +0000 @@ -1,8 +1,6 @@ This package was debianized by Rudy Godoy on Tue, 06 Feb 2005 14:45:19 -0500. -It was downloaded from - Upstream Authors: Alexander Iliev diff -Nru xfce4-xkb-plugin-0.7.1/debian/patches/01-font_selection.patch xfce4-xkb-plugin-0.8.1/debian/patches/01-font_selection.patch --- xfce4-xkb-plugin-0.7.1/debian/patches/01-font_selection.patch 2015-03-15 21:02:34.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/debian/patches/01-font_selection.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,286 +0,0 @@ -Author: Ivan Frederiks -Date: Thu, 26 Sep 2013 14:49:02 +0400 -Description: Changed text size selection to full-featured font selection - Makes the xkb plugin change font with the rest of the system -Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8446 -Bug-Debian: http://bugs.debian.org/576072 -Bug-Ubuntu: https://launchpad.net/bugs/733563 - ---- - panel-plugin/xfce4-xkb-plugin.c | 7 +++-- - panel-plugin/xfce4-xkb-plugin.h | 9 +------ - panel-plugin/xkb-cairo.c | 33 ++++--------------------- - panel-plugin/xkb-cairo.h | 4 +-- - panel-plugin/xkb-callbacks.c | 4 +-- - panel-plugin/xkb-settings-dialog.c | 47 +++++++++++++++++++++++++------------ - 6 files changed, 48 insertions(+), 56 deletions(-) - ---- a/panel-plugin/xfce4-xkb-plugin.c -+++ b/panel-plugin/xfce4-xkb-plugin.c -@@ -262,6 +262,7 @@ xkb_free (t_xkb *xkb) - gtk_widget_destroy (xkb->layout_image); - gtk_widget_destroy (xkb->btn); - xkb_destroy_popup_menu (xkb); -+ g_free (xkb->display_font); - - panel_slice_free (t_xkb, xkb); - } -@@ -288,7 +289,7 @@ xfce_xkb_save_config (XfcePanelPlugin *p - xfce_rc_set_group (rcfile, NULL); - - xfce_rc_write_int_entry (rcfile, "display_type", xkb->display_type); -- xfce_rc_write_int_entry (rcfile, "display_textsize", xkb->display_textsize); -+ xfce_rc_write_entry (rcfile, "display_font", xkb->display_font); - xfce_rc_write_int_entry (rcfile, "group_policy", xkb->group_policy); - - xfce_rc_close (rcfile); -@@ -304,7 +305,7 @@ xkb_load_config (t_xkb *xkb, const gchar - xfce_rc_set_group (rcfile, NULL); - - xkb->display_type = xfce_rc_read_int_entry (rcfile, "display_type", DISPLAY_TYPE_IMAGE); -- xkb->display_textsize = xfce_rc_read_int_entry (rcfile, "display_textsize", DISPLAY_TEXTSIZE_LARGE); -+ xkb->display_font = g_strdup(xfce_rc_read_entry (rcfile, "display_font", XKB_PREFERRED_FONT)); - xkb->group_policy = xfce_rc_read_int_entry (rcfile, "group_policy", GROUP_POLICY_PER_APPLICATION); - - xfce_rc_close (rcfile); -@@ -319,7 +320,7 @@ static void - xkb_load_default (t_xkb *xkb) - { - xkb->display_type = DISPLAY_TYPE_IMAGE; -- xkb->display_textsize = DISPLAY_TEXTSIZE_LARGE; -+ xkb->display_font = g_strdup(XKB_PREFERRED_FONT); - xkb->group_policy = GROUP_POLICY_PER_APPLICATION; - } - ---- a/panel-plugin/xfce4-xkb-plugin.h -+++ b/panel-plugin/xfce4-xkb-plugin.h -@@ -42,12 +42,7 @@ typedef enum - DISPLAY_TYPE_TEXT = 1 - } t_display_type; - --typedef enum --{ -- DISPLAY_TEXTSIZE_SMALL = 0, -- DISPLAY_TEXTSIZE_MEDIUM = 1, -- DISPLAY_TEXTSIZE_LARGE = 2 --} t_display_textsize; -+#define XKB_PREFERRED_FONT "Monospace Bold 16" - - typedef struct - { -@@ -60,7 +55,7 @@ typedef struct - gint button_vsize; /* read allocated button size - see below */ - - t_display_type display_type; /* display layout as image ot text */ -- t_display_textsize display_textsize; /* text size for text layout */ -+ gchar *display_font; /* font for text layout */ - t_group_policy group_policy; /* per-app/window/global policy */ - - gint button_state; /* gtk state of the button */ ---- a/panel-plugin/xkb-cairo.c -+++ b/panel-plugin/xkb-cairo.c -@@ -31,8 +31,6 @@ - #include - #endif - --#define XKB_PREFERRED_FONT "Courier New, Courier 10 Pitch, Monospace Bold" -- - #define xkb_cairo_arc_for_flag(cr, x, y, r, a1, a2) \ - xx = layoutx + width - 12 + x; \ - yy = layouty + height - 12 + y; \ -@@ -59,7 +57,7 @@ xkb_cairo_draw_flag (cairo_t *cr, - gint width, - gint height, - gint variant_markers_count, -- gint textsize, -+ const gchar *font_str, - GdkColor fgcolor) - { - gchar *filename; -@@ -86,7 +84,7 @@ xkb_cairo_draw_flag (cairo_t *cr, - actual_width, actual_height, - width, height, - variant_markers_count, -- textsize, -+ font_str, - fgcolor); - return; - } -@@ -136,7 +134,7 @@ xkb_cairo_draw_label (cairo_t *cr, - const gint width, - const gint height, - const gint variant_markers_count, -- const gint textsize, -+ const gchar *font_str, - const GdkColor fgcolor) - { - gchar *normalized_group_name; -@@ -168,7 +166,7 @@ xkb_cairo_draw_label (cairo_t *cr, - - pango_layout_set_text (layout, normalized_group_name, -1); - -- desc = pango_font_description_from_string ( XKB_PREFERRED_FONT ); -+ desc = pango_font_description_from_string ( font_str ); - pango_layout_set_font_description (layout, desc); - pango_font_description_free (desc); - -@@ -176,35 +174,16 @@ xkb_cairo_draw_label (cairo_t *cr, - pango_layout_get_pixel_size (layout, &pango_width, &pango_height); - DBG ("pango_width/height: %d/%d", pango_width, pango_height); - -- switch (textsize){ -- case DISPLAY_TEXTSIZE_SMALL: -- default: /* catch misconfiguration */ -- scalex = scaley = 0.475; -- break; -- case DISPLAY_TEXTSIZE_MEDIUM: -- scalex = scaley = 0.7; -- break; -- case DISPLAY_TEXTSIZE_LARGE: -- scalex = scaley = 1; -- break; -- } -- -- DBG ("txt size scale x/y: %.2f/%.2f", scalex, scaley); -- -- text_height = actual_height * scaley; -+ text_height = actual_height; - scaley = text_height / pango_height; - radius = (text_height < 32) ? 1.2 : 2.5; - diameter = 2 * radius; - -- text_width = actual_width * scalex; -+ text_width = actual_width; - if (actual_width - text_width < 3 + variant_markers_count * diameter) - { - text_width = actual_width - 3 - (variant_markers_count) * diameter; - } -- else if (textsize == DISPLAY_TEXTSIZE_LARGE) -- { -- text_width -= 3; -- } - - scalex = text_width/pango_width; - ---- a/panel-plugin/xkb-cairo.h -+++ b/panel-plugin/xkb-cairo.h -@@ -41,7 +41,7 @@ void xkb_cairo_draw_flag (cai - gint width, - gint height, - gint variant_markers_count, -- gint textsize, -+ const gchar *font_str, - GdkColor fgcolor); - - void xkb_cairo_draw_label (cairo_t *cr, -@@ -52,7 +52,7 @@ void xkb_cairo_draw_label (cai - const gint width, - const gint height, - const gint variant_markers_count, -- const gint textsize, -+ const gchar *font_str, - const GdkColor fgcolor); - - #endif ---- a/panel-plugin/xkb-callbacks.c -+++ b/panel-plugin/xkb-callbacks.c -@@ -137,7 +137,7 @@ xkb_plugin_layout_image_exposed (GtkWidg - actual_hsize, actual_vsize, - xkb->hsize, vsize, - xkb_config_variant_index_for_group (-1), -- xkb->display_textsize, -+ xkb->display_font, - fgcolor - ); - } -@@ -148,7 +148,7 @@ xkb_plugin_layout_image_exposed (GtkWidg - actual_hsize, actual_vsize, - xkb->hsize, vsize, - xkb_config_variant_index_for_group (-1), -- xkb->display_textsize, -+ xkb->display_font, - fgcolor - ); - } ---- a/panel-plugin/xkb-settings-dialog.c -+++ b/panel-plugin/xkb-settings-dialog.c -@@ -86,9 +86,30 @@ on_display_type_changed (GtkComboBox *cb - } - - static void --on_display_textsize_changed (GtkComboBox *cb, t_xkb *xkb) -+on_font_selection(GtkWidget *widget, t_xkb *xkb) - { -- xkb->display_textsize = gtk_combo_box_get_active (cb); -+ GtkWidget *dialog; -+ const gchar *group_name, *previewtext; -+ gint result; -+ -+ group_name = xkb_config_get_group_name (-1); -+ previewtext = xkb_util_normalize_group_name (group_name); -+ -+ dialog = gtk_font_selection_dialog_new(_("Select font")); -+ gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(dialog), -+ xkb->display_font); -+ gtk_font_selection_dialog_set_preview_text(GTK_FONT_SELECTION_DIALOG(dialog), -+ previewtext); -+ -+ result = gtk_dialog_run(GTK_DIALOG(dialog)); -+ if (result == GTK_RESPONSE_OK || result == GTK_RESPONSE_ACCEPT) -+ { -+ g_free(xkb->display_font); -+ xkb->display_font = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(dialog)); -+ gtk_button_set_label(GTK_BUTTON(widget), xkb->display_font); -+ } -+ gtk_widget_destroy(dialog); -+ - xkb_refresh_gui (xkb); - } - -@@ -105,7 +126,7 @@ xfce_xkb_configure (XfcePanelPlugin *plu - { - GtkWidget *display_type_optmenu, *group_policy_combo; - GtkWidget *vbox, *display_type_frame, *group_policy_frame, *bin; -- GtkWidget *display_textsize_frame, *display_textsize_optmenu; -+ GtkWidget *display_font_frame, *display_font_button; - - xfce_panel_plugin_block_menu (plugin); - -@@ -130,16 +151,13 @@ xfce_xkb_configure (XfcePanelPlugin *plu - gtk_container_add (GTK_CONTAINER (bin), display_type_optmenu); - - /* text size option */ -- display_textsize_frame = xfce_gtk_frame_box_new (_("Text size:"), &bin); -- gtk_widget_show (display_textsize_frame); -- gtk_box_pack_start (GTK_BOX (vbox), display_textsize_frame, TRUE, TRUE, 2); -- -- display_textsize_optmenu = gtk_combo_box_new_text (); -- gtk_combo_box_append_text (GTK_COMBO_BOX (display_textsize_optmenu), _("small")); -- gtk_combo_box_append_text (GTK_COMBO_BOX (display_textsize_optmenu), _("medium")); -- gtk_combo_box_append_text (GTK_COMBO_BOX (display_textsize_optmenu), _("large")); -- gtk_widget_set_size_request (display_textsize_optmenu, 230, -1); -- gtk_container_add (GTK_CONTAINER (bin), display_textsize_optmenu); -+ display_font_frame = xfce_gtk_frame_box_new (_("Text font:"), &bin); -+ gtk_widget_show (display_font_frame); -+ gtk_box_pack_start (GTK_BOX (vbox), display_font_frame, TRUE, TRUE, 2); -+ -+ display_font_button = gtk_button_new_with_label (xkb->display_font); -+ gtk_widget_set_size_request (display_font_button, 230, -1); -+ gtk_container_add (GTK_CONTAINER (bin), display_font_button); - - group_policy_frame = xfce_gtk_frame_box_new (_("Manage layout:"), &bin); - gtk_widget_show (group_policy_frame); -@@ -159,12 +177,11 @@ xfce_xkb_configure (XfcePanelPlugin *plu - G_CALLBACK (on_settings_close), xkb); - - gtk_combo_box_set_active (GTK_COMBO_BOX (display_type_optmenu), xkb->display_type); -- gtk_combo_box_set_active (GTK_COMBO_BOX (display_textsize_optmenu), xkb->display_textsize); - gtk_combo_box_set_active (GTK_COMBO_BOX (group_policy_combo), xkb->group_policy); - - g_signal_connect (display_type_optmenu, "changed", G_CALLBACK (on_display_type_changed), xkb); - g_signal_connect (group_policy_combo, "changed", G_CALLBACK (on_group_policy_changed), xkb); -- g_signal_connect (display_textsize_optmenu, "changed", G_CALLBACK (on_display_textsize_changed), xkb); -+ g_signal_connect (display_font_button, "clicked", G_CALLBACK(on_font_selection), xkb); - - gtk_widget_show (settings_dialog); - } diff -Nru xfce4-xkb-plugin-0.7.1/debian/patches/missing_linker_x11.patch xfce4-xkb-plugin-0.8.1/debian/patches/missing_linker_x11.patch --- xfce4-xkb-plugin-0.7.1/debian/patches/missing_linker_x11.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/debian/patches/missing_linker_x11.patch 2017-11-14 21:25:52.000000000 +0000 @@ -0,0 +1,38 @@ +From 0fcd3fd72ca4c3469549059948978307a7e58186 Mon Sep 17 00:00:00 2001 +From: Viktor Odintsev +Date: Sun, 10 Sep 2017 02:58:11 +0300 +Subject: Add -lX11 to libxkb_la_LIBADD + +--- + panel-plugin/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am +index 21c69ea..9f74c99 100644 +--- a/panel-plugin/Makefile.am ++++ b/panel-plugin/Makefile.am +@@ -58,7 +58,8 @@ libxkb_la_LIBADD = \ + $(LIBXKLAVIER_LIBS) \ + $(LIBWNCK_LIBS) \ + $(GARCON_LIBS) \ +- $(LIBRSVG_LIBS) ++ $(LIBRSVG_LIBS) \ ++ -lX11 + + # + # Desktop file +--- xfce4-xkb-plugin-0.8.1.orig/panel-plugin/Makefile.in ++++ xfce4-xkb-plugin-0.8.1/panel-plugin/Makefile.in +@@ -468,7 +468,8 @@ libxkb_la_LIBADD = \ + $(LIBXKLAVIER_LIBS) \ + $(LIBWNCK_LIBS) \ + $(GARCON_LIBS) \ +- $(LIBRSVG_LIBS) ++ $(LIBRSVG_LIBS) \ ++ -lX11 + + + # +-- +cgit v1.1 + diff -Nru xfce4-xkb-plugin-0.7.1/debian/patches/series xfce4-xkb-plugin-0.8.1/debian/patches/series --- xfce4-xkb-plugin-0.7.1/debian/patches/series 2015-03-15 21:06:03.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/debian/patches/series 2017-11-14 20:39:04.000000000 +0000 @@ -1 +1 @@ -01-font_selection.patch +missing_linker_x11.patch diff -Nru xfce4-xkb-plugin-0.7.1/debian/rules xfce4-xkb-plugin-0.8.1/debian/rules --- xfce4-xkb-plugin-0.7.1/debian/rules 2013-05-22 19:10:08.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/debian/rules 2017-11-14 20:36:16.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk + export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs export DEB_BUILD_MAINT_OPTIONS=hardening=+all @@ -7,6 +9,5 @@ dh $@ override_dh_auto_install: - -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a - -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la dh_auto_install + find debian/$(DEB_SOURCE)/ -name '*.la' -delete diff -Nru xfce4-xkb-plugin-0.7.1/depcomp xfce4-xkb-plugin-0.8.1/depcomp --- xfce4-xkb-plugin-0.7.1/depcomp 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/depcomp 2017-09-08 20:51:36.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 xfce4-xkb-plugin-0.7.1/flags/dev.svg xfce4-xkb-plugin-0.8.1/flags/dev.svg --- xfce4-xkb-plugin-0.7.1/flags/dev.svg 2012-07-09 18:14:55.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/flags/dev.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ - - - \ No newline at end of file diff -Nru xfce4-xkb-plugin-0.7.1/flags/in.svg xfce4-xkb-plugin-0.8.1/flags/in.svg --- xfce4-xkb-plugin-0.7.1/flags/in.svg 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/flags/in.svg 2017-06-09 20:05:47.000000000 +0000 @@ -0,0 +1,38 @@ + + + \ No newline at end of file diff -Nru xfce4-xkb-plugin-0.7.1/flags/Makefile.am xfce4-xkb-plugin-0.8.1/flags/Makefile.am --- xfce4-xkb-plugin-0.7.1/flags/Makefile.am 2015-02-27 22:00:46.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/flags/Makefile.am 2017-06-09 20:05:47.000000000 +0000 @@ -18,7 +18,7 @@ cu.svg \ cz.svg \ de.svg \ - dev.svg \ + in.svg \ dj.svg \ dk.svg \ dvorak.svg \ diff -Nru xfce4-xkb-plugin-0.7.1/flags/Makefile.in xfce4-xkb-plugin-0.8.1/flags/Makefile.in --- xfce4-xkb-plugin-0.7.1/flags/Makefile.in 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/flags/Makefile.in 2017-09-08 20:51:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 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 \ ?) ;; \ @@ -80,13 +90,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = flags -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -139,6 +148,7 @@ am__installdirs = "$(DESTDIR)$(flagsdir)" DATA = $(flags_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@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -196,13 +206,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBRSVG_2_36_2_CFLAGS = @LIBRSVG_2_36_2_CFLAGS@ -LIBRSVG_2_36_2_LIBS = @LIBRSVG_2_36_2_LIBS@ -LIBRSVG_2_36_2_REQUIRED_VERSION = @LIBRSVG_2_36_2_REQUIRED_VERSION@ -LIBRSVG_2_36_2_VERSION = @LIBRSVG_2_36_2_VERSION@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBRSVG_REQUIRED_VERSION = @LIBRSVG_REQUIRED_VERSION@ @@ -235,6 +242,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -271,6 +279,10 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XFCONF_CFLAGS = @XFCONF_CFLAGS@ +XFCONF_LIBS = @XFCONF_LIBS@ +XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ +XFCONF_VERSION = @XFCONF_VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_ARGS = @XGETTEXT_ARGS@ XMKMF = @XMKMF@ @@ -355,7 +367,7 @@ cu.svg \ cz.svg \ de.svg \ - dev.svg \ + in.svg \ dj.svg \ dk.svg \ dvorak.svg \ @@ -441,7 +453,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu flags/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu flags/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -640,6 +651,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-flagsDATA +.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 xfce4-xkb-plugin-0.7.1/flags/ru.svg xfce4-xkb-plugin-0.8.1/flags/ru.svg --- xfce4-xkb-plugin-0.7.1/flags/ru.svg 2012-07-09 18:14:55.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/flags/ru.svg 2017-03-15 12:06:15.000000000 +0000 @@ -1,6 +1,6 @@ - - + + diff -Nru xfce4-xkb-plugin-0.7.1/INSTALL xfce4-xkb-plugin-0.8.1/INSTALL --- xfce4-xkb-plugin-0.7.1/INSTALL 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/INSTALL 2017-09-08 20:51:36.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,97 +12,96 @@ Basic Installation ================== - Briefly, the shell command `./configure && make && make install' + Briefly, the shell command './configure && make && make install' should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type `make install' to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type `make installcheck' to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide `make + 8. Some packages, particularly those that use Automake, provide 'make distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: ./configure CC=c99 CFLAGS=-g LIBS=-lposix @@ -113,21 +112,21 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU `make', it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -136,105 +135,104 @@ This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, `make install +affected directory. For example, 'make install prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure +execution of 'make' will be. For these packages, running './configure --enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure +overridden with 'make V=1'; while running './configure --disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. +overridden with 'make V=0'. Particular systems ================== - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try +parse its '' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try ./configure CC="cc" @@ -242,26 +240,26 @@ ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -270,101 +268,101 @@ OS KERNEL-OS - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the "host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -`configure' Invocation +'configure' Invocation ====================== - `configure' recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help=short' -`--help=recursive' +'--help=short' +'--help=recursive' Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. + +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -`--cache-file=FILE' +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. -`--no-create' -`-n' +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. diff -Nru xfce4-xkb-plugin-0.7.1/install-sh xfce4-xkb-plugin-0.8.1/install-sh --- xfce4-xkb-plugin-0.7.1/install-sh 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/install-sh 2017-09-08 20:51:36.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 xfce4-xkb-plugin-0.7.1/ltmain.sh xfce4-xkb-plugin-0.8.1/ltmain.sh --- xfce4-xkb-plugin-0.7.1/ltmain.sh 2015-02-27 23:38:54.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/ltmain.sh 2017-09-08 20:51:33.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 xfce4-xkb-plugin-0.7.1/Makefile.in xfce4-xkb-plugin-0.8.1/Makefile.in --- xfce4-xkb-plugin-0.7.1/Makefile.in 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/Makefile.in 2017-09-08 20:51:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 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 \ ?) ;; \ @@ -79,18 +89,15 @@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in mkinstalldirs COPYING compile \ - config.guess config.sub depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(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 = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -151,6 +158,9 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ + COPYING ChangeLog INSTALL NEWS README compile config.guess \ + config.sub install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -249,13 +259,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBRSVG_2_36_2_CFLAGS = @LIBRSVG_2_36_2_CFLAGS@ -LIBRSVG_2_36_2_LIBS = @LIBRSVG_2_36_2_LIBS@ -LIBRSVG_2_36_2_REQUIRED_VERSION = @LIBRSVG_2_36_2_REQUIRED_VERSION@ -LIBRSVG_2_36_2_VERSION = @LIBRSVG_2_36_2_VERSION@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBRSVG_REQUIRED_VERSION = @LIBRSVG_REQUIRED_VERSION@ @@ -288,6 +295,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -324,6 +332,10 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XFCONF_CFLAGS = @XFCONF_CFLAGS@ +XFCONF_LIBS = @XFCONF_LIBS@ +XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ +XFCONF_VERSION = @XFCONF_VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_ARGS = @XGETTEXT_ARGS@ XMKMF = @XMKMF@ @@ -420,7 +432,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*) \ @@ -638,7 +649,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 @@ -653,17 +664,17 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @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 - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -681,7 +692,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*) \ @@ -691,23 +702,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 \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -885,6 +896,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + @SET_MAKE@ distclean-local: diff -Nru xfce4-xkb-plugin-0.7.1/missing xfce4-xkb-plugin-0.8.1/missing --- xfce4-xkb-plugin-0.7.1/missing 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/missing 2017-09-08 20:51:36.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # 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 @@ -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 xfce4-xkb-plugin-0.7.1/mkinstalldirs xfce4-xkb-plugin-0.8.1/mkinstalldirs --- xfce4-xkb-plugin-0.7.1/mkinstalldirs 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/mkinstalldirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the 'mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because '.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# 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: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru xfce4-xkb-plugin-0.7.1/NEWS xfce4-xkb-plugin-0.8.1/NEWS --- xfce4-xkb-plugin-0.7.1/NEWS 2015-02-27 23:37:18.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/NEWS 2017-09-08 20:49:39.000000000 +0000 @@ -1,3 +1,33 @@ +2017-09-08 23:50 + * New version 0.8.1 + * Add caps lock indicator for "system" layout style + * Translation updates: Albanian, Arabic, Asturian, Basque, Belarusian, + Bulgarian, Catalan, Chinese (China), Chinese (Taiwan), Croatian, Czech, + Danish, Dutch, English (Australia), English (United Kingdom), Finnish, + French, Galician, German, Greek, Hebrew, Hungarian, Icelandic, + Indonesian, Italian, Japanese, Kazakh, Korean, Latvian, Lithuanian, + Malay, Norwegian Bokmål, Occitan (post 1500), Polish, Portuguese, + Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian, + Spanish, Swedish, Thai, Turkish, Uighur, Ukrainian, Urdu, + Urdu (Pakistan), Uzbek, Uzbek (Latin) + +2017-06-16 20:10 + * New version 0.8.0 + * New plugin is not compatible with previous versions; + you will have to add and configure it again! + * Port to GTK+3 + * Add xfconf support + * Add new "system" layout style + * Allow adjusting widget size + * Allow displaying language name instead of country name + * Allow hiding tooltip icon + * Load flags from XDG_DATA_HOME if present + * Translation updates: ar ast bg ca cs da de el en_AU es fr he hr hu + id is it ja kk ko lt ms nb nl oc pl pt pt_BR ru sk sr sv th tr ug uk + zh_CN zh_TW + * Fix Indian flag filename + * Fix charset for layout names + 2015-02-27 18:29 * New version 0.7.1 - to be used with xfce4-settings 4.11 or later; do *not* use this version with XFCE 4.8 or 4.10, it won't work! diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/Makefile.am xfce4-xkb-plugin-0.8.1/panel-plugin/Makefile.am --- xfce4-xkb-plugin-0.7.1/panel-plugin/Makefile.am 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/Makefile.am 2017-09-08 20:38:01.000000000 +0000 @@ -1,65 +1,77 @@ # $Id$ -plugindir = $(libexecdir)/xfce4/panel-plugins +plugindir = \ + $(libdir)/xfce4/panel/plugins -plugin_PROGRAMS = xfce4-xkb-plugin +plugin_LTLIBRARIES = \ + libxkb.la -xfce4_xkb_plugin_SOURCES = \ - xfce4-xkb-plugin.h \ - xfce4-xkb-plugin-private.h \ - xfce4-xkb-plugin.c \ - xkb-settings-dialog.h \ - xkb-settings-dialog.c \ - xkb-config.h \ - xkb-config.c \ - xkb-util.h \ - xkb-util.c \ - xkb-cairo.h \ - xkb-cairo.c \ - xkb-callbacks.h \ - xkb-callbacks.c - - -xfce4_xkb_plugin_CFLAGS = \ - @LIBXFCE4PANEL_CFLAGS@ \ - @GTK_CFLAGS@ \ - @LIBXFCE4UI_CFLAGS@ \ - @LIBXFCE4UTIL_CFLAGS@ \ - @LIBXKLAVIER_CFLAGS@ \ - @LIBRSVG_CFLAGS@ \ - @LIBWNCK_CFLAGS@ \ - @GARCON_CFLAGS@ \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DFLAGSDIR=\"$(datadir)/xfce4/xkb/flags\" \ +libxkb_la_SOURCES = \ + xkb-plugin.h \ + xkb-plugin.c \ + xkb-properties.h \ + xkb-keyboard.h \ + xkb-keyboard.c \ + xkb-modifier.h \ + xkb-modifier.c \ + xkb-dialog.h \ + xkb-dialog.c \ + xkb-xfconf.h \ + xkb-xfconf.c \ + xkb-cairo.h \ + xkb-cairo.c \ + xkb-util.h \ + xkb-util.c + +libxkb_la_CPPFLAGS = \ + -I$(top_srcdir) \ + $(PLATFORM_CPPFLAGS) + +libxkb_la_CFLAGS = \ + $(GTK_CFLAGS) \ + $(LIBXFCE4PANEL_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ + $(XFCONF_CFLAGS) \ + $(LIBXKLAVIER_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ + $(LIBWNCK_CFLAGS) \ + $(GARCON_CFLAGS) \ + $(PLATFORM_CFLAGS) \ + -DLOCALEDIR=\"$(localedir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DFLAGSRELDIR=\"xfce4/xkb/flags\" \ -DWNCK_I_KNOW_THIS_IS_UNSTABLE - -xfce4_xkb_plugin_LDADD = \ - @LIBXFCE4PANEL_LIBS@ \ - @GTK_LIBS@ \ - @LIBXFCE4UI_LIBS@ \ - @LIBXFCE4UTIL_LIBS@ \ - @LIBXKLAVIER_LIBS@ \ - @LIBWNCK_LIBS@ \ - @GARCON_LIBS@ \ - @LIBRSVG_LIBS@ +libxkb_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + $(PLATFORM_LDFLAGS) + +libxkb_la_LIBADD = \ + $(GTK_LIBS) \ + $(LIBXFCE4PANEL_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + $(LIBXFCE4UI_LIBS) \ + $(XFCONF_LIBS) \ + $(LIBXKLAVIER_LIBS) \ + $(LIBWNCK_LIBS) \ + $(GARCON_LIBS) \ + $(LIBRSVG_LIBS) # # Desktop file # -desktopdir = $(datadir)/xfce4/panel-plugins -desktop_in_in_files = xkb-plugin.desktop.in.in -desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) -%.desktop.in: %.desktop.in.in - sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ +desktopdir = $(datadir)/xfce4/panel/plugins +desktop_in_files = xkb.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -EXTRA_DIST = \ - $(desktop_in_in_files) +EXTRA_DIST = \ + $(desktop_in_files) -CLEANFILES = \ - $(desktop_in_files) \ +CLEANFILES = \ $(desktop_DATA) # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/Makefile.in xfce4-xkb-plugin-0.8.1/panel-plugin/Makefile.in --- xfce4-xkb-plugin-0.7.1/panel-plugin/Makefile.in 2015-02-27 23:38:57.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/Makefile.in 2017-09-08 20:51:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 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, @@ -18,7 +18,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 \ ?) ;; \ @@ -82,37 +92,63 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -plugin_PROGRAMS = xfce4-xkb-plugin$(EXEEXT) subdir = panel-plugin -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(desktopdir)" -PROGRAMS = $(plugin_PROGRAMS) -am_xfce4_xkb_plugin_OBJECTS = \ - xfce4_xkb_plugin-xfce4-xkb-plugin.$(OBJEXT) \ - xfce4_xkb_plugin-xkb-settings-dialog.$(OBJEXT) \ - xfce4_xkb_plugin-xkb-config.$(OBJEXT) \ - xfce4_xkb_plugin-xkb-util.$(OBJEXT) \ - xfce4_xkb_plugin-xkb-cairo.$(OBJEXT) \ - xfce4_xkb_plugin-xkb-callbacks.$(OBJEXT) -xfce4_xkb_plugin_OBJECTS = $(am_xfce4_xkb_plugin_OBJECTS) -xfce4_xkb_plugin_DEPENDENCIES = +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +libxkb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_libxkb_la_OBJECTS = libxkb_la-xkb-plugin.lo \ + libxkb_la-xkb-keyboard.lo libxkb_la-xkb-modifier.lo \ + libxkb_la-xkb-dialog.lo libxkb_la-xkb-xfconf.lo \ + libxkb_la-xkb-cairo.lo libxkb_la-xkb-util.lo +libxkb_la_OBJECTS = $(am_libxkb_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -xfce4_xkb_plugin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ +libxkb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libxkb_la_CFLAGS) \ + $(CFLAGS) $(libxkb_la_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -147,40 +183,13 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(xfce4_xkb_plugin_SOURCES) -DIST_SOURCES = $(xfce4_xkb_plugin_SOURCES) +SOURCES = $(libxkb_la_SOURCES) +DIST_SOURCES = $(libxkb_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA = $(desktop_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -201,6 +210,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -258,13 +268,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBRSVG_2_36_2_CFLAGS = @LIBRSVG_2_36_2_CFLAGS@ -LIBRSVG_2_36_2_LIBS = @LIBRSVG_2_36_2_LIBS@ -LIBRSVG_2_36_2_REQUIRED_VERSION = @LIBRSVG_2_36_2_REQUIRED_VERSION@ -LIBRSVG_2_36_2_VERSION = @LIBRSVG_2_36_2_VERSION@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBRSVG_REQUIRED_VERSION = @LIBRSVG_REQUIRED_VERSION@ @@ -297,6 +304,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -333,6 +341,10 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XFCONF_CFLAGS = @XFCONF_CFLAGS@ +XFCONF_LIBS = @XFCONF_LIBS@ +XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ +XFCONF_VERSION = @XFCONF_VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_ARGS = @XGETTEXT_ARGS@ XMKMF = @XMKMF@ @@ -398,58 +410,77 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -plugindir = $(libexecdir)/xfce4/panel-plugins -xfce4_xkb_plugin_SOURCES = \ - xfce4-xkb-plugin.h \ - xfce4-xkb-plugin-private.h \ - xfce4-xkb-plugin.c \ - xkb-settings-dialog.h \ - xkb-settings-dialog.c \ - xkb-config.h \ - xkb-config.c \ - xkb-util.h \ - xkb-util.c \ - xkb-cairo.h \ - xkb-cairo.c \ - xkb-callbacks.h \ - xkb-callbacks.c - -xfce4_xkb_plugin_CFLAGS = \ - @LIBXFCE4PANEL_CFLAGS@ \ - @GTK_CFLAGS@ \ - @LIBXFCE4UI_CFLAGS@ \ - @LIBXFCE4UTIL_CFLAGS@ \ - @LIBXKLAVIER_CFLAGS@ \ - @LIBRSVG_CFLAGS@ \ - @LIBWNCK_CFLAGS@ \ - @GARCON_CFLAGS@ \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DFLAGSDIR=\"$(datadir)/xfce4/xkb/flags\" \ +plugindir = \ + $(libdir)/xfce4/panel/plugins + +plugin_LTLIBRARIES = \ + libxkb.la + +libxkb_la_SOURCES = \ + xkb-plugin.h \ + xkb-plugin.c \ + xkb-properties.h \ + xkb-keyboard.h \ + xkb-keyboard.c \ + xkb-modifier.h \ + xkb-modifier.c \ + xkb-dialog.h \ + xkb-dialog.c \ + xkb-xfconf.h \ + xkb-xfconf.c \ + xkb-cairo.h \ + xkb-cairo.c \ + xkb-util.h \ + xkb-util.c + +libxkb_la_CPPFLAGS = \ + -I$(top_srcdir) \ + $(PLATFORM_CPPFLAGS) + +libxkb_la_CFLAGS = \ + $(GTK_CFLAGS) \ + $(LIBXFCE4PANEL_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ + $(XFCONF_CFLAGS) \ + $(LIBXKLAVIER_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ + $(LIBWNCK_CFLAGS) \ + $(GARCON_CFLAGS) \ + $(PLATFORM_CFLAGS) \ + -DLOCALEDIR=\"$(localedir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DFLAGSRELDIR=\"xfce4/xkb/flags\" \ -DWNCK_I_KNOW_THIS_IS_UNSTABLE -xfce4_xkb_plugin_LDADD = \ - @LIBXFCE4PANEL_LIBS@ \ - @GTK_LIBS@ \ - @LIBXFCE4UI_LIBS@ \ - @LIBXFCE4UTIL_LIBS@ \ - @LIBXKLAVIER_LIBS@ \ - @LIBWNCK_LIBS@ \ - @GARCON_LIBS@ \ - @LIBRSVG_LIBS@ +libxkb_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + $(PLATFORM_LDFLAGS) + +libxkb_la_LIBADD = \ + $(GTK_LIBS) \ + $(LIBXFCE4PANEL_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + $(LIBXFCE4UI_LIBS) \ + $(XFCONF_LIBS) \ + $(LIBXKLAVIER_LIBS) \ + $(LIBWNCK_LIBS) \ + $(GARCON_LIBS) \ + $(LIBRSVG_LIBS) # # Desktop file # -desktopdir = $(datadir)/xfce4/panel-plugins -desktop_in_in_files = xkb-plugin.desktop.in.in -desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +desktopdir = $(datadir)/xfce4/panel/plugins +desktop_in_files = xkb.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ - $(desktop_in_in_files) + $(desktop_in_files) CLEANFILES = \ - $(desktop_in_files) \ $(desktop_DATA) all: all-am @@ -468,7 +499,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu panel-plugin/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu panel-plugin/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -486,59 +516,44 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-pluginPROGRAMS: $(plugin_PROGRAMS) + +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ - if test -n "$$list"; then \ + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ - } \ - ; done + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } -uninstall-pluginPROGRAMS: +uninstall-pluginLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(plugindir)" && rm -f $$files - -clean-pluginPROGRAMS: - @list='$(plugin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -xfce4-xkb-plugin$(EXEEXT): $(xfce4_xkb_plugin_OBJECTS) $(xfce4_xkb_plugin_DEPENDENCIES) $(EXTRA_xfce4_xkb_plugin_DEPENDENCIES) - @rm -f xfce4-xkb-plugin$(EXEEXT) - $(AM_V_CCLD)$(xfce4_xkb_plugin_LINK) $(xfce4_xkb_plugin_OBJECTS) $(xfce4_xkb_plugin_LDADD) $(LIBS) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libxkb.la: $(libxkb_la_OBJECTS) $(libxkb_la_DEPENDENCIES) $(EXTRA_libxkb_la_DEPENDENCIES) + $(AM_V_CCLD)$(libxkb_la_LINK) -rpath $(plugindir) $(libxkb_la_OBJECTS) $(libxkb_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -546,12 +561,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_xkb_plugin-xfce4-xkb-plugin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_xkb_plugin-xkb-cairo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_xkb_plugin-xkb-callbacks.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_xkb_plugin-xkb-config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_xkb_plugin-xkb-settings-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_xkb_plugin-xkb-util.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxkb_la-xkb-cairo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxkb_la-xkb-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxkb_la-xkb-keyboard.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxkb_la-xkb-modifier.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxkb_la-xkb-plugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxkb_la-xkb-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxkb_la-xkb-xfconf.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -574,89 +590,54 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -xfce4_xkb_plugin-xfce4-xkb-plugin.o: xfce4-xkb-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xfce4-xkb-plugin.o -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xfce4-xkb-plugin.Tpo -c -o xfce4_xkb_plugin-xfce4-xkb-plugin.o `test -f 'xfce4-xkb-plugin.c' || echo '$(srcdir)/'`xfce4-xkb-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xfce4-xkb-plugin.Tpo $(DEPDIR)/xfce4_xkb_plugin-xfce4-xkb-plugin.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce4-xkb-plugin.c' object='xfce4_xkb_plugin-xfce4-xkb-plugin.o' libtool=no @AMDEPBACKSLASH@ +libxkb_la-xkb-plugin.lo: xkb-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -MT libxkb_la-xkb-plugin.lo -MD -MP -MF $(DEPDIR)/libxkb_la-xkb-plugin.Tpo -c -o libxkb_la-xkb-plugin.lo `test -f 'xkb-plugin.c' || echo '$(srcdir)/'`xkb-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxkb_la-xkb-plugin.Tpo $(DEPDIR)/libxkb_la-xkb-plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-plugin.c' object='libxkb_la-xkb-plugin.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xfce4-xkb-plugin.o `test -f 'xfce4-xkb-plugin.c' || echo '$(srcdir)/'`xfce4-xkb-plugin.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -c -o libxkb_la-xkb-plugin.lo `test -f 'xkb-plugin.c' || echo '$(srcdir)/'`xkb-plugin.c -xfce4_xkb_plugin-xfce4-xkb-plugin.obj: xfce4-xkb-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xfce4-xkb-plugin.obj -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xfce4-xkb-plugin.Tpo -c -o xfce4_xkb_plugin-xfce4-xkb-plugin.obj `if test -f 'xfce4-xkb-plugin.c'; then $(CYGPATH_W) 'xfce4-xkb-plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfce4-xkb-plugin.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xfce4-xkb-plugin.Tpo $(DEPDIR)/xfce4_xkb_plugin-xfce4-xkb-plugin.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce4-xkb-plugin.c' object='xfce4_xkb_plugin-xfce4-xkb-plugin.obj' libtool=no @AMDEPBACKSLASH@ +libxkb_la-xkb-keyboard.lo: xkb-keyboard.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -MT libxkb_la-xkb-keyboard.lo -MD -MP -MF $(DEPDIR)/libxkb_la-xkb-keyboard.Tpo -c -o libxkb_la-xkb-keyboard.lo `test -f 'xkb-keyboard.c' || echo '$(srcdir)/'`xkb-keyboard.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxkb_la-xkb-keyboard.Tpo $(DEPDIR)/libxkb_la-xkb-keyboard.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-keyboard.c' object='libxkb_la-xkb-keyboard.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xfce4-xkb-plugin.obj `if test -f 'xfce4-xkb-plugin.c'; then $(CYGPATH_W) 'xfce4-xkb-plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfce4-xkb-plugin.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -c -o libxkb_la-xkb-keyboard.lo `test -f 'xkb-keyboard.c' || echo '$(srcdir)/'`xkb-keyboard.c -xfce4_xkb_plugin-xkb-settings-dialog.o: xkb-settings-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-settings-dialog.o -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-settings-dialog.Tpo -c -o xfce4_xkb_plugin-xkb-settings-dialog.o `test -f 'xkb-settings-dialog.c' || echo '$(srcdir)/'`xkb-settings-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-settings-dialog.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-settings-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-settings-dialog.c' object='xfce4_xkb_plugin-xkb-settings-dialog.o' libtool=no @AMDEPBACKSLASH@ +libxkb_la-xkb-modifier.lo: xkb-modifier.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -MT libxkb_la-xkb-modifier.lo -MD -MP -MF $(DEPDIR)/libxkb_la-xkb-modifier.Tpo -c -o libxkb_la-xkb-modifier.lo `test -f 'xkb-modifier.c' || echo '$(srcdir)/'`xkb-modifier.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxkb_la-xkb-modifier.Tpo $(DEPDIR)/libxkb_la-xkb-modifier.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-modifier.c' object='libxkb_la-xkb-modifier.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-settings-dialog.o `test -f 'xkb-settings-dialog.c' || echo '$(srcdir)/'`xkb-settings-dialog.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -c -o libxkb_la-xkb-modifier.lo `test -f 'xkb-modifier.c' || echo '$(srcdir)/'`xkb-modifier.c -xfce4_xkb_plugin-xkb-settings-dialog.obj: xkb-settings-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-settings-dialog.obj -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-settings-dialog.Tpo -c -o xfce4_xkb_plugin-xkb-settings-dialog.obj `if test -f 'xkb-settings-dialog.c'; then $(CYGPATH_W) 'xkb-settings-dialog.c'; else $(CYGPATH_W) '$(srcdir)/xkb-settings-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-settings-dialog.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-settings-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-settings-dialog.c' object='xfce4_xkb_plugin-xkb-settings-dialog.obj' libtool=no @AMDEPBACKSLASH@ +libxkb_la-xkb-dialog.lo: xkb-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -MT libxkb_la-xkb-dialog.lo -MD -MP -MF $(DEPDIR)/libxkb_la-xkb-dialog.Tpo -c -o libxkb_la-xkb-dialog.lo `test -f 'xkb-dialog.c' || echo '$(srcdir)/'`xkb-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxkb_la-xkb-dialog.Tpo $(DEPDIR)/libxkb_la-xkb-dialog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-dialog.c' object='libxkb_la-xkb-dialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-settings-dialog.obj `if test -f 'xkb-settings-dialog.c'; then $(CYGPATH_W) 'xkb-settings-dialog.c'; else $(CYGPATH_W) '$(srcdir)/xkb-settings-dialog.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -c -o libxkb_la-xkb-dialog.lo `test -f 'xkb-dialog.c' || echo '$(srcdir)/'`xkb-dialog.c -xfce4_xkb_plugin-xkb-config.o: xkb-config.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-config.o -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-config.Tpo -c -o xfce4_xkb_plugin-xkb-config.o `test -f 'xkb-config.c' || echo '$(srcdir)/'`xkb-config.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-config.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-config.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-config.c' object='xfce4_xkb_plugin-xkb-config.o' libtool=no @AMDEPBACKSLASH@ +libxkb_la-xkb-xfconf.lo: xkb-xfconf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -MT libxkb_la-xkb-xfconf.lo -MD -MP -MF $(DEPDIR)/libxkb_la-xkb-xfconf.Tpo -c -o libxkb_la-xkb-xfconf.lo `test -f 'xkb-xfconf.c' || echo '$(srcdir)/'`xkb-xfconf.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxkb_la-xkb-xfconf.Tpo $(DEPDIR)/libxkb_la-xkb-xfconf.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-xfconf.c' object='libxkb_la-xkb-xfconf.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-config.o `test -f 'xkb-config.c' || echo '$(srcdir)/'`xkb-config.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -c -o libxkb_la-xkb-xfconf.lo `test -f 'xkb-xfconf.c' || echo '$(srcdir)/'`xkb-xfconf.c -xfce4_xkb_plugin-xkb-config.obj: xkb-config.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-config.obj -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-config.Tpo -c -o xfce4_xkb_plugin-xkb-config.obj `if test -f 'xkb-config.c'; then $(CYGPATH_W) 'xkb-config.c'; else $(CYGPATH_W) '$(srcdir)/xkb-config.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-config.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-config.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-config.c' object='xfce4_xkb_plugin-xkb-config.obj' libtool=no @AMDEPBACKSLASH@ +libxkb_la-xkb-cairo.lo: xkb-cairo.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -MT libxkb_la-xkb-cairo.lo -MD -MP -MF $(DEPDIR)/libxkb_la-xkb-cairo.Tpo -c -o libxkb_la-xkb-cairo.lo `test -f 'xkb-cairo.c' || echo '$(srcdir)/'`xkb-cairo.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxkb_la-xkb-cairo.Tpo $(DEPDIR)/libxkb_la-xkb-cairo.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-cairo.c' object='libxkb_la-xkb-cairo.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-config.obj `if test -f 'xkb-config.c'; then $(CYGPATH_W) 'xkb-config.c'; else $(CYGPATH_W) '$(srcdir)/xkb-config.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -c -o libxkb_la-xkb-cairo.lo `test -f 'xkb-cairo.c' || echo '$(srcdir)/'`xkb-cairo.c -xfce4_xkb_plugin-xkb-util.o: xkb-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-util.o -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-util.Tpo -c -o xfce4_xkb_plugin-xkb-util.o `test -f 'xkb-util.c' || echo '$(srcdir)/'`xkb-util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-util.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-util.c' object='xfce4_xkb_plugin-xkb-util.o' libtool=no @AMDEPBACKSLASH@ +libxkb_la-xkb-util.lo: xkb-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -MT libxkb_la-xkb-util.lo -MD -MP -MF $(DEPDIR)/libxkb_la-xkb-util.Tpo -c -o libxkb_la-xkb-util.lo `test -f 'xkb-util.c' || echo '$(srcdir)/'`xkb-util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxkb_la-xkb-util.Tpo $(DEPDIR)/libxkb_la-xkb-util.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-util.c' object='libxkb_la-xkb-util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-util.o `test -f 'xkb-util.c' || echo '$(srcdir)/'`xkb-util.c - -xfce4_xkb_plugin-xkb-util.obj: xkb-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-util.obj -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-util.Tpo -c -o xfce4_xkb_plugin-xkb-util.obj `if test -f 'xkb-util.c'; then $(CYGPATH_W) 'xkb-util.c'; else $(CYGPATH_W) '$(srcdir)/xkb-util.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-util.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-util.c' object='xfce4_xkb_plugin-xkb-util.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-util.obj `if test -f 'xkb-util.c'; then $(CYGPATH_W) 'xkb-util.c'; else $(CYGPATH_W) '$(srcdir)/xkb-util.c'; fi` - -xfce4_xkb_plugin-xkb-cairo.o: xkb-cairo.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-cairo.o -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-cairo.Tpo -c -o xfce4_xkb_plugin-xkb-cairo.o `test -f 'xkb-cairo.c' || echo '$(srcdir)/'`xkb-cairo.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-cairo.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-cairo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-cairo.c' object='xfce4_xkb_plugin-xkb-cairo.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-cairo.o `test -f 'xkb-cairo.c' || echo '$(srcdir)/'`xkb-cairo.c - -xfce4_xkb_plugin-xkb-cairo.obj: xkb-cairo.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-cairo.obj -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-cairo.Tpo -c -o xfce4_xkb_plugin-xkb-cairo.obj `if test -f 'xkb-cairo.c'; then $(CYGPATH_W) 'xkb-cairo.c'; else $(CYGPATH_W) '$(srcdir)/xkb-cairo.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-cairo.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-cairo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-cairo.c' object='xfce4_xkb_plugin-xkb-cairo.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-cairo.obj `if test -f 'xkb-cairo.c'; then $(CYGPATH_W) 'xkb-cairo.c'; else $(CYGPATH_W) '$(srcdir)/xkb-cairo.c'; fi` - -xfce4_xkb_plugin-xkb-callbacks.o: xkb-callbacks.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-callbacks.o -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-callbacks.Tpo -c -o xfce4_xkb_plugin-xkb-callbacks.o `test -f 'xkb-callbacks.c' || echo '$(srcdir)/'`xkb-callbacks.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-callbacks.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-callbacks.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-callbacks.c' object='xfce4_xkb_plugin-xkb-callbacks.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-callbacks.o `test -f 'xkb-callbacks.c' || echo '$(srcdir)/'`xkb-callbacks.c - -xfce4_xkb_plugin-xkb-callbacks.obj: xkb-callbacks.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -MT xfce4_xkb_plugin-xkb-callbacks.obj -MD -MP -MF $(DEPDIR)/xfce4_xkb_plugin-xkb-callbacks.Tpo -c -o xfce4_xkb_plugin-xkb-callbacks.obj `if test -f 'xkb-callbacks.c'; then $(CYGPATH_W) 'xkb-callbacks.c'; else $(CYGPATH_W) '$(srcdir)/xkb-callbacks.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_xkb_plugin-xkb-callbacks.Tpo $(DEPDIR)/xfce4_xkb_plugin-xkb-callbacks.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xkb-callbacks.c' object='xfce4_xkb_plugin-xkb-callbacks.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_xkb_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_xkb_plugin-xkb-callbacks.obj `if test -f 'xkb-callbacks.c'; then $(CYGPATH_W) 'xkb-callbacks.c'; else $(CYGPATH_W) '$(srcdir)/xkb-callbacks.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxkb_la_CPPFLAGS) $(CPPFLAGS) $(libxkb_la_CFLAGS) $(CFLAGS) -c -o libxkb_la-xkb-util.lo `test -f 'xkb-util.c' || echo '$(srcdir)/'`xkb-util.c mostlyclean-libtool: -rm -f *.lo @@ -769,7 +750,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(DATA) +all-am: Makefile $(LTLIBRARIES) $(DATA) installdirs: for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(desktopdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -807,7 +788,7 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-pluginPROGRAMS \ +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -828,7 +809,7 @@ info-am: -install-data-am: install-desktopDATA install-pluginPROGRAMS +install-data-am: install-desktopDATA install-pluginLTLIBRARIES install-dvi: install-dvi-am @@ -874,27 +855,27 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-pluginPROGRAMS +uninstall-am: uninstall-desktopDATA uninstall-pluginLTLIBRARIES .MAKE: install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pluginPROGRAMS cscopelist-am ctags \ + clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \ ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-desktopDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ - install-pdf-am install-pluginPROGRAMS install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-desktopDATA uninstall-pluginPROGRAMS + install-pdf-am install-pluginLTLIBRARIES install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-desktopDATA uninstall-pluginLTLIBRARIES + +.PRECIOUS: Makefile -%.desktop.in: %.desktop.in.in - sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ @INTLTOOL_DESKTOP_RULE@ # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xfce4-xkb-plugin.c xfce4-xkb-plugin-0.8.1/panel-plugin/xfce4-xkb-plugin.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xfce4-xkb-plugin.c 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xfce4-xkb-plugin.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,485 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xfce4-xkb-plugin.c - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -#include - -#include -#include - -#include "xfce4-xkb-plugin.h" -#include "xfce4-xkb-plugin-private.h" -#include "xkb-settings-dialog.h" -#include "xkb-util.h" -#include "xkb-cairo.h" -#include "xkb-callbacks.h" - -/* ------------------------------------------------------------------ * - * Panel Plugin Interface * - * ------------------------------------------------------------------ */ - -static void xfce_xkb_construct (XfcePanelPlugin *plugin); - -static void xfce_xkb_orientation_changed (XfcePanelPlugin *plugin, - GtkOrientation orientation, - t_xkb *xkb); - -static gboolean xfce_xkb_set_size (XfcePanelPlugin *plugin, - gint size, - t_xkb *xkb); - -static void xfce_xkb_free_data (XfcePanelPlugin *plugin, - t_xkb *xkb); - -/* ----------------------------------------------------------------- * - * XKB Stuff * - * ----------------------------------------------------------------- */ - -static t_xkb * xkb_new (XfcePanelPlugin *plugin); - -static void xkb_free (t_xkb *xkb); - -static gboolean xkb_calculate_sizes (t_xkb *xkb, - GtkOrientation orientation, - gint panel_size); - -static gboolean xkb_load_config (t_xkb *xkb, - const gchar *filename); - -static void xkb_load_default (t_xkb *xkb); - -static void xkb_populate_popup_menu (t_xkb *xkb); - -static void xkb_destroy_popup_menu (t_xkb *xkb); - -static void xfce_xkb_configure_layout (GtkWidget *widget, - gpointer user_data); - - -/* ================================================================== * - * Implementation * - * ================================================================== */ - -XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (xfce_xkb_construct); - -static void -xfce_xkb_construct (XfcePanelPlugin *plugin) -{ - GtkWidget *configure_layouts; - GtkIconTheme *theme; - GtkWidget *image; - GdkPixbuf *pixbuf; - - t_xkb *xkb = xkb_new (plugin); - - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); - - xfce_panel_plugin_set_small (plugin, TRUE); - - g_signal_connect (plugin, "orientation-changed", - G_CALLBACK (xfce_xkb_orientation_changed), xkb); - - g_signal_connect (plugin, "size-changed", - G_CALLBACK (xfce_xkb_set_size), xkb); - - g_signal_connect (plugin, "free-data", - G_CALLBACK (xfce_xkb_free_data), xkb); - - g_signal_connect (plugin, "save", - G_CALLBACK (xfce_xkb_save_config), xkb); - - xfce_panel_plugin_menu_show_configure (plugin); - g_signal_connect (plugin, "configure-plugin", - G_CALLBACK (xfce_xkb_configure), xkb); - - xfce_panel_plugin_menu_show_about (plugin); - g_signal_connect (plugin, "about", - G_CALLBACK (xfce_xkb_about), xkb); - - configure_layouts = - gtk_image_menu_item_new_with_label (_("Keyboard settings")); - - theme = gtk_icon_theme_get_for_screen (gdk_screen_get_default()); - pixbuf = gtk_icon_theme_load_icon (theme, "preferences-desktop-keyboard", - GTK_ICON_SIZE_MENU, 0, NULL); - if (pixbuf != NULL) - { - image = gtk_image_new (); - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configure_layouts), - image); - g_object_unref (pixbuf); - } - - gtk_widget_show (configure_layouts); - xfce_panel_plugin_menu_insert_item (plugin, - GTK_MENU_ITEM (configure_layouts)); - - g_signal_connect (G_OBJECT (configure_layouts), "activate", - G_CALLBACK (xfce_xkb_configure_layout), NULL); -} - -static void -xfce_xkb_orientation_changed (XfcePanelPlugin *plugin, - GtkOrientation orientation, - t_xkb *xkb) -{ - xkb_calculate_sizes (xkb, orientation, xfce_panel_plugin_get_size (plugin)); -} - -static gboolean -xfce_xkb_set_size (XfcePanelPlugin *plugin, gint size, - t_xkb *xkb) -{ - return xkb_calculate_sizes (xkb, xfce_panel_plugin_get_orientation (plugin), size); -} - -static void -xfce_xkb_free_data (XfcePanelPlugin *plugin, t_xkb *xkb) -{ - xkb_free (xkb); -} - -/* ----------------- xkb plugin stuff -----------------------*/ - -static void -xkb_state_changed (gint current_group, gboolean config_changed, - gpointer user_data) -{ - t_xkb *xkb = (t_xkb*) user_data; - - xkb_refresh_gui (xkb); - - if (config_changed) - { - xkb_populate_popup_menu (xkb); - } -} - -static void -xkb_plugin_set_group (GtkMenuItem *item, - gpointer data) -{ - gint group = GPOINTER_TO_INT (data); - xkb_config_set_group (group); -} - -static t_xkb * -xkb_new (XfcePanelPlugin *plugin) -{ - t_xkb *xkb; - gchar *filename; - WnckScreen *wnck_screen; - - xkb = panel_slice_new0 (t_xkb); - xkb->plugin = plugin; - - filename = xfce_panel_plugin_lookup_rc_file (plugin); - if ((!filename) || (!xkb_load_config (xkb, filename))) - { - xkb_load_default (xkb); - } - g_free (filename); - - xkb->btn = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (xkb->btn), GTK_RELIEF_NONE); - gtk_container_add (GTK_CONTAINER (xkb->plugin), xkb->btn); - xfce_panel_plugin_add_action_widget (xkb->plugin, xkb->btn); - xkb->button_state = GTK_STATE_NORMAL; - - gtk_widget_show (xkb->btn); - g_signal_connect (xkb->btn, "clicked", G_CALLBACK (xkb_plugin_button_clicked), xkb); - g_signal_connect (xkb->btn, "scroll-event", - G_CALLBACK (xkb_plugin_button_scrolled), NULL); - - g_object_set (G_OBJECT (xkb->btn), "has-tooltip", TRUE, NULL); - g_signal_connect (xkb->btn, "query-tooltip", - G_CALLBACK (xkb_plugin_set_tooltip), xkb); - - g_signal_connect (G_OBJECT (xkb->btn), "enter-notify-event", - G_CALLBACK (xkb_plugin_button_entered), xkb); - g_signal_connect (G_OBJECT (xkb->btn), "leave-notify-event", - G_CALLBACK (xkb_plugin_button_left), xkb); - g_signal_connect (G_OBJECT (xkb->btn), "size-allocate", - G_CALLBACK (xkb_plugin_button_size_allocated), xkb); - - xkb->layout_image = gtk_image_new (); - gtk_container_add (GTK_CONTAINER (xkb->btn), xkb->layout_image); - g_signal_connect (G_OBJECT (xkb->layout_image), "expose-event", - G_CALLBACK (xkb_plugin_layout_image_exposed), xkb); - gtk_widget_show (GTK_WIDGET (xkb->layout_image)); - - if (xkb_config_initialize (xkb->group_policy, xkb_state_changed, xkb)) - { - xkb_refresh_gui (xkb); - xkb_populate_popup_menu (xkb); - } - - wnck_screen = wnck_screen_get_default (); - g_signal_connect (G_OBJECT (wnck_screen), "active-window-changed", - G_CALLBACK (xkb_plugin_active_window_changed), xkb); - g_signal_connect (G_OBJECT (wnck_screen), "window-closed", - G_CALLBACK (xkb_plugin_window_closed), xkb); - g_signal_connect (G_OBJECT (wnck_screen), "application-closed", - G_CALLBACK (xkb_plugin_application_closed), xkb); - - return xkb; -} - -static void -xkb_free (t_xkb *xkb) -{ - xkb_config_finalize (); - - gtk_widget_destroy (xkb->layout_image); - gtk_widget_destroy (xkb->btn); - xkb_destroy_popup_menu (xkb); - - panel_slice_free (t_xkb, xkb); -} - -void -xfce_xkb_save_config (XfcePanelPlugin *plugin, t_xkb *xkb) -{ - gchar* filename; - XfceRc* rcfile; - - - filename = xfce_panel_plugin_save_location (plugin, TRUE); - if (!filename) - return; - - - rcfile = xfce_rc_simple_open (filename, FALSE); - if (!rcfile) - { - g_free (filename); - return; - } - - xfce_rc_set_group (rcfile, NULL); - - xfce_rc_write_int_entry (rcfile, "display_type", xkb->display_type); - xfce_rc_write_int_entry (rcfile, "display_textsize", xkb->display_textsize); - xfce_rc_write_int_entry (rcfile, "group_policy", xkb->group_policy); - - xfce_rc_close (rcfile); - g_free (filename); -} - -static gboolean -xkb_load_config (t_xkb *xkb, const gchar *filename) -{ - XfceRc* rcfile; - if ((rcfile = xfce_rc_simple_open (filename, TRUE))) - { - xfce_rc_set_group (rcfile, NULL); - - xkb->display_type = xfce_rc_read_int_entry (rcfile, "display_type", DISPLAY_TYPE_IMAGE); - xkb->display_textsize = xfce_rc_read_int_entry (rcfile, "display_textsize", DISPLAY_TEXTSIZE_LARGE); - xkb->group_policy = xfce_rc_read_int_entry (rcfile, "group_policy", GROUP_POLICY_PER_APPLICATION); - - xfce_rc_close (rcfile); - - return TRUE; - } - - return FALSE; -} - -static void -xkb_load_default (t_xkb *xkb) -{ - xkb->display_type = DISPLAY_TYPE_IMAGE; - xkb->display_textsize = DISPLAY_TEXTSIZE_LARGE; - xkb->group_policy = GROUP_POLICY_PER_APPLICATION; -} - -static gboolean -xkb_calculate_sizes (t_xkb *xkb, GtkOrientation orientation, gint panel_size) -{ - guint nrows; - - nrows = xfce_panel_plugin_get_nrows (xkb->plugin); - panel_size /= nrows; - TRACE ("calculate_sizes(%p: %d,%d)", xkb, panel_size, nrows); - - switch (orientation) - { - case GTK_ORIENTATION_HORIZONTAL: - xkb->vsize = panel_size; - if (nrows > 1) - { - xkb->hsize = xkb->vsize; - } - else - { - xkb->hsize = (int) (1.33 * panel_size); - } - - gtk_widget_set_size_request (xkb->btn, xkb->hsize, xkb->vsize); - break; - case GTK_ORIENTATION_VERTICAL: - xkb->hsize = panel_size; - if (nrows > 1) - { - xkb->vsize = xkb->hsize; - } - else - { - xkb->vsize = (int) (0.75 * panel_size); - } - if (xkb->vsize < 10) xkb->vsize = 10; - gtk_widget_set_size_request (xkb->btn, xkb->hsize, xkb->vsize); - break; - default: - break; - } - - DBG ("size requested: h/v (%p: %d/%d)", xkb, xkb->hsize, xkb->vsize); - - xkb_refresh_gui (xkb); - return TRUE; -} - -static void -xkb_destroy_popup_menu (t_xkb *xkb) -{ - if (xkb->popup) - { - gtk_widget_destroy (xkb->popup); - g_object_ref_sink (xkb->popup); - g_object_unref (xkb->popup); - xkb->popup = NULL; - } -} - -static void -xkb_populate_popup_menu (t_xkb *xkb) -{ - gint i, group_count; - RsvgHandle *handle; - GdkPixbuf *pixbuf, *tmp; - gchar *imgfilename; - GtkWidget *image; - GtkWidget *menu_item; - - if (G_UNLIKELY (xkb == NULL)) return; - - xkb_destroy_popup_menu (xkb); - xkb->popup = gtk_menu_new (); - - group_count = xkb_config_get_group_count (); - for (i = 0; i < group_count; i++) - { - gchar *layout_string; - - imgfilename = xkb_util_get_flag_filename (xkb_config_get_group_name (i)); - handle = rsvg_handle_new_from_file (imgfilename, NULL); - g_free (imgfilename); - - if (handle) - { - tmp = rsvg_handle_get_pixbuf (handle); - } - - layout_string = xkb_config_get_pretty_layout_name (i); - - menu_item = gtk_image_menu_item_new_with_label (layout_string); - - g_signal_connect (G_OBJECT (menu_item), "activate", - G_CALLBACK (xkb_plugin_set_group), GINT_TO_POINTER (i)); - - if (handle) - { - image = gtk_image_new (); - pixbuf = gdk_pixbuf_scale_simple (tmp, 15, 10, GDK_INTERP_BILINEAR); - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); - gtk_widget_show (image); - g_object_unref (G_OBJECT (tmp)); - g_object_unref (G_OBJECT (pixbuf)); - - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image); - - rsvg_handle_close (handle, NULL); - g_object_unref (handle); - } - - gtk_widget_show (menu_item); - - gtk_menu_shell_append (GTK_MENU_SHELL (xkb->popup), menu_item); - } -} - -void -xkb_refresh_gui (t_xkb *xkb) -{ - GdkDisplay * display; - - /* Part of the image may remain visible after display type change */ - gtk_widget_queue_draw_area (xkb->btn, 0, 0, - xkb->button_hsize, xkb->button_vsize); - - display = gdk_display_get_default(); - if (display) - { - gtk_tooltip_trigger_tooltip_query(display); - } -} - -static void -xfce_xkb_configure_layout (GtkWidget *widget, - gpointer user_data) -{ - gchar *desktop_file = xfce_resource_lookup (XFCE_RESOURCE_DATA, - "applications/xfce-keyboard-settings.desktop"); - - GarconMenuItem *item = garcon_menu_item_new_for_path (desktop_file); - if (item) - { - GError *error = NULL; - gchar **argv; - gboolean succeed; - g_shell_parse_argv (garcon_menu_item_get_command (item), NULL, &argv, &error); - succeed = xfce_spawn_on_screen (gtk_widget_get_screen (GTK_WIDGET (widget)), - garcon_menu_item_get_path (item), - argv, NULL, G_SPAWN_SEARCH_PATH, - garcon_menu_item_supports_startup_notification (item), - gtk_get_current_event_time (), - garcon_menu_item_get_icon_name (item), - &error); - g_strfreev (argv); - garcon_menu_item_unref (item); - g_assert (succeed); - - } - g_free (desktop_file); -} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xfce4-xkb-plugin.h xfce4-xkb-plugin-0.8.1/panel-plugin/xfce4-xkb-plugin.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xfce4-xkb-plugin.h 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xfce4-xkb-plugin.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xfce4-xkb-plugin.h - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _XFCE_XKB_H_ -#define _XFCE_XKB_H_ - -#include "xkb-config.h" - -#include -#include -#include - -#include -#include -#include - -typedef enum -{ - DISPLAY_TYPE_IMAGE = 0, - DISPLAY_TYPE_TEXT = 1 -} t_display_type; - -typedef enum -{ - DISPLAY_TEXTSIZE_SMALL = 0, - DISPLAY_TEXTSIZE_MEDIUM = 1, - DISPLAY_TEXTSIZE_LARGE = 2 -} t_display_textsize; - -typedef struct -{ - XfcePanelPlugin *plugin; - - /* options */ - gint hsize; /* plugin horizontal size */ - gint vsize; /* plugin vertical size */ - gint button_hsize; /* real allocated button size - see below */ - gint button_vsize; /* read allocated button size - see below */ - - t_display_type display_type; /* display layout as image ot text */ - t_display_textsize display_textsize; /* text size for text layout */ - t_group_policy group_policy; /* per-app/window/global policy */ - - gint button_state; /* gtk state of the button */ - - /* widgets */ - GtkWidget *btn; - GtkWidget *layout_image; - GtkWidget *popup; -} t_xkb; - -/* - * NOTE: The t_xkb->button_size field is due to xfce panel 4.4.1 - * prior versions, allowing a plugin to resize the whole panel. - * This should be removed after xfce 4.4.2, where this behaviour - * should not be possible. - */ - -#endif - diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xfce4-xkb-plugin-private.h xfce4-xkb-plugin-0.8.1/panel-plugin/xfce4-xkb-plugin-private.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xfce4-xkb-plugin-private.h 2012-07-09 18:14:55.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xfce4-xkb-plugin-private.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xfce4-xkb-plugin-private.h - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _XFCE_XKB_PRIVATE_H_ -#define _XFCE_XKB_PRIVATE_H_ - -void xfce_xkb_save_config (XfcePanelPlugin *plugin, - t_xkb *xkb); - -void xkb_refresh_gui (t_xkb *xkb); - -#endif - diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-cairo.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-cairo.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-cairo.c 2015-02-27 21:53:11.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-cairo.c 2017-06-28 21:04:55.000000000 +0000 @@ -23,219 +23,276 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "xkb-cairo.h" #include "xkb-util.h" -#include "xfce4-xkb-plugin.h" - -#ifndef HAVE_LIBRSVG_2_36_2 -#include -#endif #define XKB_PREFERRED_FONT "Courier New, Courier 10 Pitch, Monospace Bold" -#define xkb_cairo_arc_for_flag(cr, x, y, r, a1, a2) \ - xx = layoutx + width - 12 + x; \ - yy = layouty + height - 12 + y; \ - cairo_device_to_user (cr, &xx, &yy); \ - cairo_arc (cr, xx, yy, r, a1, a2); - -#define xkb_cairo_arc_for_label(cr, x, y, r, a1, a2) xx = x; \ - yy = y; \ - cairo_device_to_user (cr, &xx, &yy); \ - cairo_arc (cr, xx, yy, r, a1, a2); - -#define xkb_cairo_move_to(cr, x, y) xx = x; \ - yy = y; \ - cairo_device_to_user (cr, &xx, &yy); \ - cairo_move_to (cr, xx, yy); void -xkb_cairo_draw_flag (cairo_t *cr, - const gchar *group_name, - gint panel_size, - gint actual_width, - gint actual_height, - gint width, - gint height, - gint variant_markers_count, - gint textsize, - GdkColor fgcolor) +xkb_cairo_draw_flag (cairo_t *cr, + const GdkPixbuf *image, + gint actual_width, + gint actual_height, + gint variant_markers_count, + guint max_variant_markers_count, + guint scale) { - gchar *filename; - RsvgHandle *handle; - RsvgDimensionData dim; - double scalex, scaley; - double xx, yy; - gint i; - double layoutx, layouty; - - g_assert (cr != NULL); - - if (!group_name) - return; - - filename = xkb_util_get_flag_filename (group_name); - handle = rsvg_handle_new_from_file (filename, NULL); - g_free (filename); + double scalex, scaley; + gint i, x, y, width, height; + double layoutx, layouty, img_width, img_height; + double radius, diameter; + guint spacing; - if (!handle) - { - xkb_cairo_draw_label (cr, group_name, - panel_size, - actual_width, actual_height, - width, height, - variant_markers_count, - textsize, - fgcolor); - return; - } + g_assert (image != NULL); + + width = gdk_pixbuf_get_width (image); + height = gdk_pixbuf_get_height (image); + + scalex = (double) (actual_width - 4) / width; + scaley = (double) (actual_height - 4) / height; + + scalex *= scale / 100.0; + scaley *= scale / 100.0; - rsvg_handle_get_dimensions (handle, &dim); + img_width = width * scalex; + img_height = height * scaley; - scalex = (double) (width - 4) / dim.width; - scaley = (double) (height - 4) / dim.height; + DBG ("scale x/y: %.3f/%.3f, dim w/h: %d/%d, scaled w/h: %.1f/%.1f", + scalex, scaley, width, height, scalex * width, scaley * height); - layoutx = (actual_width - width) / 2 + 2; - layouty = (actual_height - height) / 2 + 2; - cairo_translate (cr, layoutx, layouty); + layoutx = (actual_width - img_width) / 2; + layouty = (actual_height - img_height) / 2; + cairo_translate (cr, layoutx, layouty); - cairo_save (cr); + cairo_save (cr); - cairo_scale (cr, scalex, scaley); - rsvg_handle_render_cairo (handle, cr); + cairo_scale (cr, scalex, scaley); + gdk_cairo_set_source_pixbuf (cr, image, 0, 0); + cairo_paint (cr); - cairo_restore (cr); + cairo_restore (cr); - /* draw variant_markers_count circles */ - for (i = 0; i < variant_markers_count; i++) + DBG ("actual width/height: %d/%d; img w/h: %.1f/%.1f; markers: %d, max markers: %d", + actual_width, actual_height, img_width, img_height, + variant_markers_count, max_variant_markers_count); + DBG ("layout x/y: %.1f/%.1f", layoutx, layouty); + + if (variant_markers_count > 0) { - cairo_set_source_rgb (cr, 0, 0, 0); + diameter = 5.0; + spacing = 1; + + /* check if the flag is too small to draw variant markers inside it */ + if ((diameter + spacing) * (max_variant_markers_count-1) > img_width - 2) + { + /* draw markers below the flag */ + diameter = 4; + spacing = 0; + layoutx = actual_width / 2 + (max_variant_markers_count - 2) * diameter / 2; + layouty = (actual_height + img_height) / 2 + diameter + 1; + DBG ("small flag"); + } + else + { + /* draw markers inside the flag */ + spacing = 1; + layoutx += img_width - diameter / 2 - 1; + layouty += img_height - diameter / 2 - 1; + DBG ("large flag"); + } - cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); - cairo_set_line_width (cr, 1); + radius = diameter / 2.0; - xkb_cairo_arc_for_flag (cr, -(7 * i) + 4, 4, 2.5, 0, 2 * G_PI); + if (layouty > actual_height - radius) + layouty = actual_height - radius; - cairo_set_source_rgb (cr, 0, 0, 0); - cairo_fill_preserve (cr); - cairo_set_source_rgb (cr, 1, 1, 1); - cairo_stroke (cr); + if (layoutx > actual_width - radius) + layoutx = actual_width - radius; } - rsvg_handle_close (handle, NULL); - g_object_unref (handle); + /* draw variant_markers_count circles */ + for (i = 0; i < variant_markers_count; i++) + { + cairo_set_source_rgb (cr, 0, 0, 0); + + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + cairo_set_line_width (cr, 1); + + x = layoutx - (diameter + spacing) * i + 0.5; + y = layouty; + + DBG ("variant center x/y: %d/%d, diameter: %.1f, spacing: %d", + x, y, diameter, spacing); + cairo_arc (cr, x, y, radius, 0, 2 * G_PI); + + cairo_set_source_rgb (cr, 0, 0, 0); + cairo_fill_preserve (cr); + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_stroke (cr); + } } + + void -xkb_cairo_draw_label (cairo_t *cr, +xkb_cairo_draw_label (cairo_t *cr, const gchar *group_name, - const gint panel_size, - const gint actual_width, - const gint actual_height, - const gint width, - const gint height, - const gint variant_markers_count, - const gint textsize, - const GdkColor fgcolor) + gint actual_width, + gint actual_height, + gint variant_markers_count, + guint scale, + GdkRGBA rgba) { - gchar *normalized_group_name; - gint pango_width, pango_height; - double layoutx, layouty, text_width, text_height; - double xx, yy; - double scalex, scaley; - gint i; - double radius, diameter; - - PangoLayout *layout; - PangoFontDescription *desc; - - g_assert (cr != NULL); + gchar *normalized_group_name; + gint pango_width, pango_height; + double layoutx, layouty, text_width, text_height; + double scalex, scaley; + gint i, x, y; + double radius, diameter; + PangoLayout *layout; + PangoFontDescription *desc; - DBG ("actual width/height: %d/%d; markers: %d", - actual_width, actual_height, variant_markers_count); + DBG ("actual width/height: %d/%d; markers: %d", + actual_width, actual_height, variant_markers_count); - layout = pango_cairo_create_layout (cr); - normalized_group_name = xkb_util_normalize_group_name (group_name); + normalized_group_name = xkb_util_normalize_group_name (group_name, FALSE); - if (!normalized_group_name || - !g_utf8_validate (normalized_group_name, -1, NULL)) - { - g_object_unref (layout); - g_free (normalized_group_name); - return; - } + if (!normalized_group_name) + return; - pango_layout_set_text (layout, normalized_group_name, -1); + layout = pango_cairo_create_layout (cr); - desc = pango_font_description_from_string ( XKB_PREFERRED_FONT ); - pango_layout_set_font_description (layout, desc); - pango_font_description_free (desc); - - gdk_cairo_set_source_color (cr, &fgcolor); - pango_layout_get_pixel_size (layout, &pango_width, &pango_height); - DBG ("pango_width/height: %d/%d", pango_width, pango_height); - - switch (textsize){ - case DISPLAY_TEXTSIZE_SMALL: - default: /* catch misconfiguration */ - scalex = scaley = 0.475; - break; - case DISPLAY_TEXTSIZE_MEDIUM: - scalex = scaley = 0.7; - break; - case DISPLAY_TEXTSIZE_LARGE: - scalex = scaley = 1; - break; - } + pango_layout_set_text (layout, normalized_group_name, -1); - DBG ("txt size scale x/y: %.2f/%.2f", scalex, scaley); + desc = pango_font_description_from_string ( XKB_PREFERRED_FONT ); + pango_layout_set_font_description (layout, desc); + pango_font_description_free (desc); - text_height = actual_height * scaley; - scaley = text_height / pango_height; - radius = (text_height < 32) ? 1.2 : 2.5; - diameter = 2 * radius; + gdk_cairo_set_source_rgba (cr, &rgba); + pango_layout_get_pixel_size (layout, &pango_width, &pango_height); + DBG ("pango_width/height: %d/%d", pango_width, pango_height); - text_width = actual_width * scalex; - if (actual_width - text_width < 3 + variant_markers_count * diameter) - { - text_width = actual_width - 3 - (variant_markers_count) * diameter; - } - else if (textsize == DISPLAY_TEXTSIZE_LARGE) + scalex = scaley = scale / 100.0; + + DBG ("txt size scale x/y: %.2f/%.2f", scalex, scaley); + + text_height = actual_height * scaley; + scaley = text_height / pango_height; + radius = (text_height < 32) ? 1.2 : 2.5; + diameter = 2 * radius; + + text_width = actual_width * scalex; + if (actual_width - text_width < 3 + variant_markers_count * diameter) + text_width = actual_width - 3 - (variant_markers_count) * diameter; + else if (scale >= 99.5) + text_width -= 3; + + scalex = text_width/pango_width; + + layoutx = (actual_width - (text_width + (variant_markers_count ? 3:0) + + variant_markers_count * diameter)) / 2; + layouty = (actual_height - text_height) / 2; + + DBG ("text_width/height: %.2f/%.2f", text_width, text_height); + DBG ("layout x/y: %.2f/%.2f scale x/y: %.2f/%.2f, radius: %.2f", + layoutx, layouty, scalex, scaley, radius); + + cairo_save (cr); + cairo_move_to (cr, layoutx, layouty); + cairo_scale (cr, scalex, scaley); + pango_cairo_show_layout (cr, layout); + cairo_restore (cr); + + for (i = 0; i < variant_markers_count; i++) { - text_width -= 3; + x = layoutx + text_width + 3 + (diameter * i); + y = layouty + text_height - (text_height / 5); + + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + cairo_set_line_width (cr, 1); + cairo_arc (cr, x, y, radius, 0, 2 * G_PI); + cairo_fill (cr); } - scalex = text_width/pango_width; + g_free (normalized_group_name); + g_object_unref (layout); +} + + + +void +xkb_cairo_draw_label_system (cairo_t *cr, + const gchar *group_name, + gint actual_width, + gint actual_height, + gint variant_markers_count, + gboolean caps_lock_enabled, + const PangoFontDescription *desc, + GdkRGBA rgba) +{ + gchar *normalized_group_name; + gint pango_width, pango_height; + double layoutx, layouty; + gint i, x, y; + double radius, diameter; + PangoLayout *layout; + + DBG ("actual width/height: %d/%d; markers: %d", + actual_width, actual_height, variant_markers_count); + + normalized_group_name = xkb_util_normalize_group_name (group_name, TRUE); - layoutx = (actual_width - - (text_width + (variant_markers_count ? 3:0) + - variant_markers_count * diameter)) / 2; - layouty = (actual_height - text_height) / 2; - - DBG ("text_width/height: %.2f/%.2f", text_width, text_height); - DBG ("layout x/y: %.2f/%.2f scale x/y: %.2f/%.2f, radius: %.2f", - layoutx, layouty, scalex, scaley, radius); - - xkb_cairo_move_to (cr, layoutx, layouty); - cairo_save (cr); - cairo_scale (cr, scalex, scaley); - pango_cairo_show_layout (cr, layout); - cairo_restore (cr); + if (!normalized_group_name) + return; - for (i = 0; i < variant_markers_count; i++) + layout = pango_cairo_create_layout (cr); + + pango_layout_set_text (layout, normalized_group_name, -1); + pango_layout_set_font_description (layout, desc); + + gdk_cairo_set_source_rgba (cr, &rgba); + pango_layout_get_pixel_size (layout, &pango_width, &pango_height); + DBG ("pango_width/height: %d/%d", pango_width, pango_height); + + layoutx = (double) (actual_width - pango_width) / 2; + layouty = (actual_height - pango_height) / 2; + radius = pango_height / 10; + diameter = 2 * radius; + + DBG ("layout x/y: %.2f/%.2f, radius: %.2f", layoutx, layouty, radius); + + cairo_move_to (cr, layoutx, layouty); + pango_cairo_show_layout (cr, layout); + + for (i = 0; i < variant_markers_count; i++) { - cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); - cairo_set_line_width (cr, 1); - xkb_cairo_arc_for_label (cr, - layoutx + text_width + 3 + (diameter * i), - layouty + text_height - (text_height / 5), - radius, 0, 2 * G_PI - ); - cairo_fill (cr); + x = layoutx + (pango_width - (2 * variant_markers_count - 2) * diameter) / 2 + 2 * diameter * i; + y = layouty + pango_height + radius; + + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + cairo_set_line_width (cr, 1); + cairo_arc (cr, x, y, radius, 0, 2 * G_PI); + cairo_fill (cr); } - g_free (normalized_group_name); - g_object_unref (layout); -} + if (caps_lock_enabled) + { + y = layouty - radius; + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + cairo_set_line_width (cr, 1); + cairo_arc (cr, layoutx + radius, y, radius, 0, 2 * G_PI); + cairo_fill (cr); + cairo_arc (cr, layoutx + pango_width - radius, y, radius, 0, 2 * G_PI); + cairo_fill (cr); + cairo_rectangle (cr, layoutx + radius, layouty - diameter, pango_width - diameter, diameter); + cairo_fill (cr); + } + + g_free (normalized_group_name); + g_object_unref (layout); +} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-cairo.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-cairo.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-cairo.h 2013-03-26 20:53:17.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-cairo.h 2017-06-28 21:04:55.000000000 +0000 @@ -26,34 +26,33 @@ #ifndef _XKB_CAIRO_H_ #define _XKB_CAIRO_H_ -#include -#include #include #include -#include #include -void xkb_cairo_draw_flag (cairo_t *cr, - const gchar *flag_name, - gint panel_size, - gint actual_width, - gint actual_height, - gint width, - gint height, - gint variant_markers_count, - gint textsize, - GdkColor fgcolor); +void xkb_cairo_draw_flag (cairo_t *cr, + const GdkPixbuf *image, + gint actual_width, + gint actual_height, + gint variant_markers_count, + guint max_variant_markers_count, + guint scale); -void xkb_cairo_draw_label (cairo_t *cr, - const gchar *group_name, - const gint panel_size, - const gint actual_width, - const gint actual_height, - const gint width, - const gint height, - const gint variant_markers_count, - const gint textsize, - const GdkColor fgcolor); +void xkb_cairo_draw_label (cairo_t *cr, + const gchar *group_name, + gint actual_width, + gint actual_height, + gint variant_markers_count, + guint scale, + GdkRGBA rgba); -#endif +void xkb_cairo_draw_label_system (cairo_t *cr, + const gchar *group_name, + gint actual_width, + gint actual_height, + gint variant_markers_count, + gboolean caps_lock_enabled, + const PangoFontDescription *desc, + GdkRGBA rgba); +#endif diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-callbacks.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-callbacks.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-callbacks.c 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-callbacks.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xkb-callbacks.c - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "xkb-callbacks.h" -#include "xkb-cairo.h" -#include "xkb-util.h" - -static void xkb_plugin_popup_menu (GtkButton *btn, - gpointer data); - -void -xkb_plugin_active_window_changed (WnckScreen *screen, - WnckWindow *previously_active_window, - t_xkb *xkb) -{ - WnckWindow *window; - guint window_id, application_id; - - window = wnck_screen_get_active_window (screen); - if (!WNCK_IS_WINDOW (window)) return; - window_id = wnck_window_get_xid (window); - application_id = wnck_window_get_pid (window); - - xkb_config_window_changed (window_id, application_id); -} - -void -xkb_plugin_application_closed (WnckScreen *screen, - WnckApplication *app, - t_xkb *xkb) -{ - guint application_id; - - application_id = wnck_application_get_pid (app); - - xkb_config_application_closed (application_id); -} - -void -xkb_plugin_window_closed (WnckScreen *screen, - WnckWindow *window, - t_xkb *xkb) -{ - guint window_id; - - window_id = wnck_window_get_xid (window); - - xkb_config_window_closed (window_id); -} - -void -xkb_plugin_button_size_allocated (GtkWidget *button, - GtkAllocation *allocation, - t_xkb *xkb) -{ - xkb->button_hsize = allocation->width; - xkb->button_vsize = allocation->height; - - DBG ("size_allocated: h/v (%p: %d/%d)", - xkb, xkb->button_hsize, xkb->button_vsize); -} - -gboolean -xkb_plugin_button_entered (GtkWidget *widget, - GdkEventCrossing *event, - t_xkb *xkb) -{ - xkb->button_state = GTK_STATE_PRELIGHT; - return FALSE; -} - -gboolean -xkb_plugin_button_left (GtkWidget *widget, - GdkEventCrossing *event, - t_xkb *xkb) -{ - xkb->button_state = GTK_STATE_NORMAL; - return FALSE; -} - -gboolean -xkb_plugin_layout_image_exposed (GtkWidget *widget, - GdkEventExpose *event, - t_xkb *xkb) -{ - const gchar *group_name; - cairo_t *cr; - GtkStyle *style; - GdkColor fgcolor; - gint actual_hsize, actual_vsize, panel_size; - gint vsize; - - actual_hsize = (xkb->button_hsize > xkb->hsize) ? xkb->button_hsize : xkb->hsize; - actual_vsize = (xkb->button_vsize > xkb->vsize) ? xkb->button_vsize : xkb->vsize; - - vsize = MIN (xkb->vsize, (int) (xkb->hsize * 0.75)); - - panel_size = xfce_panel_plugin_get_size (xkb->plugin); - panel_size /= xfce_panel_plugin_get_nrows (xkb->plugin); - - style = gtk_widget_get_style (GTK_WIDGET (xkb->btn)); - fgcolor = style->fg[xkb->button_state]; - group_name = xkb_config_get_group_name (-1); - - DBG ("img_exposed: actual h/v (%d/%d), xkb h/v (%d/%d), panel sz (%d)", - actual_hsize, actual_vsize, - xkb->hsize, xkb->vsize, panel_size); - - cr = gdk_cairo_create ((GTK_WIDGET (xkb->layout_image))->window); - - if (xkb->display_type == DISPLAY_TYPE_IMAGE) - { - xkb_cairo_draw_flag (cr, group_name, - panel_size, - actual_hsize, actual_vsize, - xkb->hsize, vsize, - xkb_config_variant_index_for_group (-1), - xkb->display_textsize, - fgcolor - ); - } - else - { - xkb_cairo_draw_label (cr, group_name, - panel_size, - actual_hsize, actual_vsize, - xkb->hsize, vsize, - xkb_config_variant_index_for_group (-1), - xkb->display_textsize, - fgcolor - ); - } - - cairo_destroy (cr); - - return FALSE; -} - -void -xkb_plugin_button_clicked (GtkButton *btn, - gpointer data) -{ - if (xkb_config_get_group_count () > 2) - { - xkb_plugin_popup_menu (btn, data); - } - else - { - xkb_config_next_group (); - } -} - -gboolean -xkb_plugin_button_scrolled (GtkWidget *btn, - GdkEventScroll *event, - gpointer data) -{ - switch (event->direction) - { - case GDK_SCROLL_UP: - case GDK_SCROLL_RIGHT: - xkb_config_next_group (); - return TRUE; - case GDK_SCROLL_DOWN: - case GDK_SCROLL_LEFT: - xkb_config_prev_group (); - return TRUE; - default: - return FALSE; - } - - return FALSE; -} - -static void -xkb_plugin_popup_menu (GtkButton *btn, - gpointer data) -{ - t_xkb *xkb = (t_xkb *) data; - gtk_menu_popup (GTK_MENU (xkb->popup), - NULL, NULL, NULL, NULL, 0, - gtk_get_current_event_time ()); -} - -gboolean -xkb_plugin_set_tooltip (GtkWidget *widget, - gint x, - gint y, - gboolean keyboard_mode, - GtkTooltip *tooltip, - t_xkb *xkb) -{ - gint group = xkb_config_get_current_group (); - GdkPixbuf *pixbuf = xkb_config_get_tooltip_pixbuf (group); - gchar *layout_name = xkb_config_get_pretty_layout_name (group); - - gtk_tooltip_set_icon (tooltip, pixbuf); - gtk_tooltip_set_text (tooltip, layout_name); - - return TRUE; -} - diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-callbacks.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-callbacks.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-callbacks.h 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-callbacks.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xkb-callbacks.h - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _XKB_CALLBACKS_H_ -#define _XKB_CALLBACKS_H_ - -#include -#include -#include - -#include "xfce4-xkb-plugin.h" - -gboolean xkb_plugin_layout_image_exposed (GtkWidget *widget, - GdkEventExpose *event, - t_xkb *xkb); - -gboolean xkb_plugin_button_entered (GtkWidget *widget, - GdkEventCrossing *event, - t_xkb *xkb); - -gboolean xkb_plugin_button_left (GtkWidget *widget, - GdkEventCrossing *event, - t_xkb *xkb); - -void xkb_plugin_button_size_allocated (GtkWidget *button, - GtkAllocation *allocation, - t_xkb *xkb); - -void xkb_plugin_active_window_changed (WnckScreen *screen, - WnckWindow *previously_active_window, - t_xkb *xkb); - -void xkb_plugin_application_closed (WnckScreen *screen, - WnckApplication *app, - t_xkb *xkb); - -void xkb_plugin_window_closed (WnckScreen *screen, - WnckWindow *window, - t_xkb *xkb); - -void xkb_plugin_button_clicked (GtkButton *btn, - gpointer data); - -gboolean xkb_plugin_button_scrolled (GtkWidget *btn, - GdkEventScroll *event, - gpointer data); - -gboolean xkb_plugin_set_tooltip (GtkWidget *widget, - gint x, - gint y, - gboolean keyboard_mode, - GtkTooltip *tooltip, - t_xkb *xkb); - -#endif - diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-config.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-config.c 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-config.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,599 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xkb-config.c - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "xkb-config.h" -#include "xkb-util.h" - -#include -#include -#include - -#include - -#include -#include -#include -#include - -#ifndef DEBUG -#define G_DISABLE_ASSERT -#endif - -typedef struct -{ - gchar *group_name; - gchar *variant; - gchar *pretty_layout_name; - GdkPixbuf *tooltip_pixbuf; -} t_group_data; - -typedef struct -{ - XklEngine *engine; - - t_group_data *group_data; - - t_group_policy group_policy; - GHashTable *variant_index_by_group; - - GHashTable *application_map; - GHashTable *window_map; - - guint current_window_id; - guint current_application_id; - - gint group_count; - gint current_group; - - XkbCallback callback; - gpointer callback_data; -} t_xkb_config; - -static t_xkb_config *config; - -static void xkb_config_xkl_state_changed (XklEngine *engine, - XklEngineStateChange change, - gint group, - gboolean restore, - gpointer user_data); - -static void xkb_config_xkl_config_changed (XklEngine *engine, - gpointer user_data); - -static GdkFilterReturn - handle_xevent (GdkXEvent * xev, - GdkEvent * event); - -static void xkb_config_free (); -static void xkb_config_update_from_xkl (); -static void xkb_config_initialize_xkb_options (const XklConfigRec *config_rec); - -/* ---------------------- implementation ------------------------- */ - -gboolean -xkb_config_initialize (t_group_policy group_policy, - XkbCallback callback, - gpointer callback_data) -{ - config = g_new0 (t_xkb_config, 1); - - config->group_policy = group_policy; - - config->callback = callback; - config->callback_data = callback_data; - - config->engine = xkl_engine_get_instance (GDK_DISPLAY ()); - - if (!config->engine) - { - return FALSE; - } - - xkb_config_update_from_xkl (); - - xkl_engine_set_group_per_toplevel_window (config->engine, FALSE); - - xkl_engine_start_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE); - - g_signal_connect (config->engine, - "X-state-changed", - G_CALLBACK (xkb_config_xkl_state_changed), - NULL); - g_signal_connect (config->engine, - "X-config-changed", - G_CALLBACK (xkb_config_xkl_config_changed), - NULL); - gdk_window_add_filter (NULL, (GdkFilterFunc) handle_xevent, NULL); - - return TRUE; -} - -static gchar * -xkb_config_xkb_description (XklConfigItem *config_item) -{ - gchar *ci_description; - gchar *description; - - ci_description = g_strstrip (config_item->description); - - if (ci_description[0] == 0) - description = g_strdup (config_item->name); - else - description = g_locale_to_utf8 (ci_description, -1, NULL, NULL, NULL); - - return description; -} - -static gchar* -xkb_config_create_pretty_layout_name (XklConfigRegistry *registry, - XklConfigItem *config_item, - gchar *layout_name, - gchar *layout_variant) -{ - gchar *pretty_layout_name; - - g_snprintf (config_item->name, sizeof (config_item->name), - "%s", layout_variant); - if (xkl_config_registry_find_variant (registry, layout_name, config_item)) - { - pretty_layout_name = xkb_config_xkb_description (config_item); - } - else - { - g_snprintf (config_item->name, sizeof (config_item->name), - "%s", layout_name); - if (xkl_config_registry_find_layout (registry, config_item)) - { - pretty_layout_name = xkb_config_xkb_description (config_item); - } - else - { - pretty_layout_name = xkb_util_get_layout_string (layout_name, - layout_variant); - } - } - - return pretty_layout_name; -} - -static void -xkb_config_initialize_xkb_options (const XklConfigRec *config_rec) -{ - GHashTable *index_variants; - gchar **group; - gint val, i; - gpointer pval; - gchar *imgfilename; - XklConfigRegistry *registry; - XklConfigItem *config_item; - - xkb_config_free (); - - group = config_rec->layouts; - config->group_count = 0; - while (*group) - { - group++; - config->group_count++; - } - - config->window_map = g_hash_table_new (g_direct_hash, NULL); - config->application_map = g_hash_table_new (g_direct_hash, NULL); - config->group_data = (t_group_data *) g_new0 (typeof (t_group_data), - config->group_count); - config->variant_index_by_group = g_hash_table_new (NULL, NULL); - index_variants = g_hash_table_new (g_str_hash, g_str_equal); - - registry = xkl_config_registry_get_instance (config->engine); - xkl_config_registry_load (registry, FALSE); - config_item = xkl_config_item_new (); - - for (i = 0; i < config->group_count; i++) - { - t_group_data *group_data = &config->group_data[i]; - RsvgHandle *handle; - - group_data->group_name = g_strdup (config_rec->layouts[i]); - - group_data->variant = (config_rec->variants[i] == NULL) - ? g_strdup ("") : g_strdup (config_rec->variants[i]); - - pval = g_hash_table_lookup ( - index_variants, - group_data->group_name - ); - val = (pval != NULL) ? GPOINTER_TO_INT (pval) : 0; - val++; - g_hash_table_insert ( - config->variant_index_by_group, - GINT_TO_POINTER (i), - GINT_TO_POINTER (val) - ); - g_hash_table_insert ( - index_variants, - group_data->group_name, - GINT_TO_POINTER (val) - ); - - imgfilename = xkb_util_get_flag_filename (group_data->group_name); - handle = rsvg_handle_new_from_file (imgfilename, NULL); - if (handle) - { - GdkPixbuf *tmp = rsvg_handle_get_pixbuf (handle); - group_data->tooltip_pixbuf = - gdk_pixbuf_scale_simple (tmp, 30, 22, GDK_INTERP_BILINEAR); - g_object_unref (tmp); - rsvg_handle_close (handle, NULL); - g_object_unref (handle); - } - g_free (imgfilename); - - group_data->pretty_layout_name = - xkb_config_create_pretty_layout_name (registry, config_item, - group_data->group_name, - group_data->variant); - } - g_object_unref (config_item); - g_object_unref (registry); - g_hash_table_destroy (index_variants); -} - -static void -xkb_config_free (void) -{ - gint i; - - g_assert (config != NULL); - - if (config->variant_index_by_group) - g_hash_table_destroy (config->variant_index_by_group); - - if (config->window_map) - g_hash_table_destroy (config->window_map); - - if (config->application_map) - g_hash_table_destroy (config->application_map); - - if (config->group_data) - { - for (i = 0; i < config->group_count; i++) - { - t_group_data *group_data = &config->group_data[i]; - g_free (group_data->group_name); - g_free (group_data->variant); - g_free (group_data->pretty_layout_name); - if (group_data->tooltip_pixbuf) - { - g_object_unref (group_data->tooltip_pixbuf); - } - } - g_free (config->group_data); - } -} - -void -xkb_config_finalize (void) -{ - xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE); - g_object_unref (config->engine); - - xkb_config_free (); - g_free (config); - - gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL); -} - -gint -xkb_config_get_current_group (void) -{ - return config->current_group; -} - -gboolean -xkb_config_set_group (gint group) -{ - g_assert (config != NULL); - - if (G_UNLIKELY (group < 0 || group >= config->group_count)) - { - return FALSE; - } - - xkl_engine_lock_group (config->engine, group); - config->current_group = group; - - return TRUE; -} - -gboolean -xkb_config_next_group (void) -{ - xkl_engine_lock_group (config->engine, - xkl_engine_get_next_group (config->engine)); - - return TRUE; -} - -gboolean -xkb_config_prev_group (void) -{ - xkl_engine_lock_group (config->engine, - xkl_engine_get_prev_group (config->engine)); - - return TRUE; -} - -void -xkb_config_set_group_policy (t_group_policy group_policy) -{ - config->group_policy = group_policy; -} - -static void -xkb_config_update_from_xkl (void) -{ - XklConfigRec *config_rec; - - - g_assert (config != NULL); - - config_rec = xkl_config_rec_new (); - xkl_config_rec_get_from_server (config_rec, config->engine); - - xkb_config_initialize_xkb_options (config_rec); - - g_object_unref (config_rec); -} - -void -xkb_config_window_changed (guint new_window_id, guint application_id) -{ - gint group; - gpointer key, value; - GHashTable *hashtable; - guint id; - - g_assert (config != NULL); - - id = 0; - hashtable = NULL; - - switch (config->group_policy) - { - case GROUP_POLICY_GLOBAL: - return; - - case GROUP_POLICY_PER_WINDOW: - hashtable = config->window_map; - id = new_window_id; - config->current_window_id = id; - break; - - case GROUP_POLICY_PER_APPLICATION: - hashtable = config->application_map; - id = application_id; - config->current_application_id = id; - break; - } - - group = 0; - - if (g_hash_table_lookup_extended (hashtable, GINT_TO_POINTER (id), &key, &value)) - { - group = GPOINTER_TO_INT (value); - } - else - { - g_hash_table_insert (hashtable, - GINT_TO_POINTER (id), - GINT_TO_POINTER (group)); - } - - xkb_config_set_group (group); -} - -void -xkb_config_application_closed (guint application_id) -{ - g_assert (config != NULL); - - switch (config->group_policy) - { - case GROUP_POLICY_GLOBAL: - case GROUP_POLICY_PER_WINDOW: - return; - - case GROUP_POLICY_PER_APPLICATION: - g_hash_table_remove ( - config->application_map, - GINT_TO_POINTER (application_id) - ); - - break; - } -} - -void -xkb_config_window_closed (guint window_id) -{ - g_assert (config != NULL); - - switch (config->group_policy) - { - case GROUP_POLICY_GLOBAL: - case GROUP_POLICY_PER_APPLICATION: - return; - - case GROUP_POLICY_PER_WINDOW: - g_hash_table_remove ( - config->window_map, - GINT_TO_POINTER (window_id) - ); - - break; - } -} - - -gint -xkb_config_get_group_count (void) -{ - g_assert (config != NULL); - - return config->group_count; -} - -const gchar* -xkb_config_get_group_name (gint group) -{ - g_assert (config != NULL); - - if (G_UNLIKELY (group >= config->group_count)) - return NULL; - - if (group == -1) - group = xkb_config_get_current_group (); - - return config->group_data[group].group_name; -} - -const gchar* -xkb_config_get_variant (gint group) -{ - g_assert (config != NULL); - - if (G_UNLIKELY (group >= config->group_count)) - return NULL; - - if (group == -1) - group = xkb_config_get_current_group (); - - return config->group_data[group].variant; -} - -void -xkb_config_xkl_state_changed (XklEngine *engine, - XklEngineStateChange change, - gint group, - gboolean restore, - gpointer user_data) -{ - if (change == GROUP_CHANGED) - { - config->current_group = group; - - switch (config->group_policy) - { - case GROUP_POLICY_GLOBAL: - break; - - case GROUP_POLICY_PER_WINDOW: - g_hash_table_insert ( - config->window_map, - GINT_TO_POINTER (config->current_window_id), - GINT_TO_POINTER (group) - ); - break; - - case GROUP_POLICY_PER_APPLICATION: - g_hash_table_insert ( - config->application_map, - GINT_TO_POINTER (config->current_application_id), - GINT_TO_POINTER (group) - ); - break; - } - - if (config->callback != NULL) config->callback (group, FALSE, config->callback_data); - } -} - -void -xkb_config_xkl_config_changed (XklEngine *engine, gpointer user_data) -{ - xkb_config_update_from_xkl (); - - if (config->callback != NULL) - { - xkb_config_set_group (0); - config->callback (0, TRUE, config->callback_data); - } -} - -gint -xkb_config_variant_index_for_group (gint group) -{ - gpointer presult; - gint result; - - g_return_val_if_fail (config != NULL, 0); - - if (group == -1) group = xkb_config_get_current_group (); - - presult = g_hash_table_lookup ( - config->variant_index_by_group, - GINT_TO_POINTER (group) - ); - if (presult == NULL) return 0; - - result = GPOINTER_TO_INT (presult); - result = (result <= 0) ? 0 : result - 1; - return result; -} - -GdkFilterReturn -handle_xevent (GdkXEvent * xev, GdkEvent * event) -{ - XEvent *xevent = (XEvent *) xev; - - xkl_engine_filter_events (config->engine, xevent); - - return GDK_FILTER_CONTINUE; -} - -XklConfigRegistry* -xkb_config_get_xkl_registry (void) -{ - XklConfigRegistry *registry; - - if (!config) return NULL; - - registry = xkl_config_registry_get_instance (config->engine); - xkl_config_registry_load (registry, FALSE); - - return registry; -} - -GdkPixbuf* -xkb_config_get_tooltip_pixbuf (gint group) -{ - return config->group_data[group].tooltip_pixbuf; -} - -gchar* -xkb_config_get_pretty_layout_name (gint group) -{ - return config->group_data[group].pretty_layout_name; -} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-config.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-config.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-config.h 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-config.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xkb-config.h - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _XKB_CONFIG_H_ -#define _XKB_CONFIG_H_ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include - -typedef enum -{ - GROUP_POLICY_GLOBAL = 0, - GROUP_POLICY_PER_WINDOW = 1, - GROUP_POLICY_PER_APPLICATION = 2 -} t_group_policy; - -typedef void (*XkbCallback) (gint current_group, - gboolean groups_changed, - gpointer user_data); - -gboolean xkb_config_initialize (t_group_policy group_policy, - XkbCallback callback, - gpointer data); -void xkb_config_finalize (void); -void xkb_config_set_group_policy (t_group_policy group_policy); -gint xkb_config_get_group_count (void); -const gchar* xkb_config_get_group_name (gint group); -const gchar* xkb_config_get_variant (gint group); -gboolean xkb_config_set_group (gint group); -gboolean xkb_config_next_group (void); -gboolean xkb_config_prev_group (void); -gint xkb_config_variant_index_for_group (gint group); - -void xkb_config_window_changed (guint new_window_id, - guint application_id); -void xkb_config_application_closed (guint application_id); -void xkb_config_window_closed (guint window_id); -GdkPixbuf* xkb_config_get_tooltip_pixbuf (gint group); -gchar* xkb_config_get_pretty_layout_name (gint group); -gint xkb_config_get_current_group (void); - -/* TODO: remove this function - xkl structures should not be used outside xkb-config */ -XklConfigRegistry* - xkb_config_get_xkl_registry (void); - -#ifdef DEBUG - -#define XKB_DEBUG(...) \ - do { g_fprintf (stderr, "[[ XFCE XKB PLUGIN ]]: "__VA_ARGS__); g_fprintf (stderr, "\n"); } while (0) - -#define XKB_DEBUG_KBD(kbd, msg) g_printf("DUMPING KEYBOARD SETTINGS [[[%s]]] {%d}: ", msg, kbd);\ - if (kbd) { \ - g_printf ("\n\ - model: %s [%d]\n\ - layouts: %s [%d]\n\ - variants: %s [%d]\n\ - options: %s [%d]\n", \ - kbd->model, kbd->model, \ - kbd->layouts, kbd->layouts, \ - kbd->variants, kbd->variants, \ - kbd->options, kbd->options); \ - } else { \ - g_printf("NULL\n"); \ - } - -#define XKB_DEBUG_CONFIG_REC(crec, msg) g_printf("DUMPING CONFIG REC [[[%s]]] {%d}: ", msg, (int) crec);\ - if (crec) { \ - g_printf ("\n\ - model: %s [%d]\n\ - layouts: %s [%d]\n\ - variants: %s [%d]\n", \ - crec->model, (int) crec->model, \ - g_strjoinv (",", crec->layouts), (int) crec->layouts, \ - g_strjoinv (",", crec->variants), (int) crec->variants); \ - } else { \ - g_printf ("NULL\n"); \ - } - -#define XKB_DEBUG_GROUP_NAMES(groupnames, i, count) \ - for (i = 0; i < count; i++) {\ - if (groupnames && groupnames[i]) { \ - XKB_DEBUG("group : %s", groupnames[i]); \ - } \ - } - -#else - -#define XKB_DEBUG(...) -#define XKB_DEBUG_KBD(kbd, msg) -#define XKB_DEBUG_CONFIG_REC(crec, msg) -#define XKB_DEBUG_GROUP_NAMES(groupnames, i, count) - -#endif - -#endif - diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb.desktop.in xfce4-xkb-plugin-0.8.1/panel-plugin/xkb.desktop.in --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb.desktop.in 2017-06-09 20:05:47.000000000 +0000 @@ -0,0 +1,9 @@ +[Xfce Panel] +Type=X-XFCE-PanelPlugin +_Name=Keyboard Layouts +_Comment=Keyboard layouts setup and switch plugin +Icon=preferences-desktop-keyboard +X-XFCE-Module=xkb +X-XFCE-Unique=TRUE +X-XFCE-Internal=FALSE +X-XFCE-API=2.0 diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-dialog.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-dialog.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-dialog.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-dialog.c 2017-07-26 19:29:22.000000000 +0000 @@ -0,0 +1,300 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-dialog.c + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * A part of this file comes from the gnome keyboard capplet (control-center): + * Copyright (C) 2003 Sergey V. Oudaltsov + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include "xkb-plugin.h" +#include "xkb-properties.h" +#include "xkb-dialog.h" + + + +static gboolean +xkb_dialog_transform_scale_range_for_display_type (GBinding *binding, + const GValue *from_value, + GValue *to_value, + gpointer user_data) +{ + gint display_type = g_value_get_int (from_value); + g_value_set_boolean (to_value, + display_type == DISPLAY_TYPE_IMAGE || display_type == DISPLAY_TYPE_TEXT); + return TRUE; +} + + + +static gboolean +xkb_dialog_transform_scale_range_for_caps_lock_indicator (GBinding *binding, + const GValue *from_value, + GValue *to_value, + gpointer user_data) +{ + gint display_type = g_value_get_int (from_value); + g_value_set_boolean (to_value, + display_type == DISPLAY_TYPE_SYSTEM); + return TRUE; +} + + + +static gboolean +xkb_dialog_set_style_warning_tooltip (GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip *tooltip) +{ + if (!gtk_widget_get_sensitive (widget)) + { + gtk_tooltip_set_text (tooltip, + _("This option is not available for current layout style")); + gtk_tooltip_set_icon_from_icon_name (tooltip, + "dialog-warning-symbolic", + GTK_ICON_SIZE_SMALL_TOOLBAR); + + return TRUE; + } + + return FALSE; +} + + + +void +xkb_dialog_configure_plugin (XfcePanelPlugin *plugin, + XkbXfconf *config) +{ + GtkWidget *settings_dialog; + GtkWidget *display_type_combo; + GtkWidget *display_name_combo; + GtkWidget *display_scale_range; + GtkWidget *caps_lock_indicator_switch; + GtkWidget *display_tooltip_icon_switch; + GtkWidget *group_policy_combo; + GtkWidget *vbox, *frame, *bin, *grid, *label; + gint grid_vertical; + + xfce_panel_plugin_block_menu (plugin); + + settings_dialog = xfce_titled_dialog_new_with_buttons (_("Keyboard Layouts"), + NULL, 0, "gtk-close", + GTK_RESPONSE_OK, NULL); + gtk_window_set_icon_name (GTK_WINDOW (settings_dialog), "xfce4-settings"); + + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); + gtk_widget_set_margin_start (vbox, 8); + gtk_widget_set_margin_end (vbox, 8); + gtk_widget_set_margin_top (vbox, 8); + gtk_widget_set_margin_bottom (vbox, 8); + gtk_widget_show (vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (settings_dialog))), vbox); + + grid_vertical = 0; + + frame = xfce_gtk_frame_box_new (_("Appearance"), &bin); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 2); + + grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (grid), 6); + gtk_grid_set_column_spacing (GTK_GRID (grid), 18); + gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE); + gtk_widget_set_size_request (grid, -1, -1); + gtk_container_add (GTK_CONTAINER (bin), grid); + + label = gtk_label_new (_("Show layout as:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.f); + gtk_widget_set_hexpand (label, TRUE); + gtk_grid_attach (GTK_GRID (grid), label, 0, grid_vertical, 1, 1); + + display_type_combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (display_type_combo), _("image")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (display_type_combo), _("text")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (display_type_combo), _("system")); + gtk_widget_set_size_request (display_type_combo, 230, -1); + gtk_grid_attach (GTK_GRID (grid), display_type_combo, 1, grid_vertical, 1, 1); + + grid_vertical++; + + label = gtk_label_new (_("Layout name:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.f); + gtk_widget_set_hexpand (label, TRUE); + gtk_grid_attach (GTK_GRID (grid), label, 0, grid_vertical, 1, 1); + + display_name_combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (display_name_combo), _("country")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (display_name_combo), _("language")); + gtk_widget_set_size_request (display_name_combo, 230, -1); + gtk_grid_attach (GTK_GRID (grid), display_name_combo, 1, grid_vertical, 1, 1); + + grid_vertical++; + + label = gtk_label_new (_("Widget size:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.f); + gtk_widget_set_hexpand (label, TRUE); + gtk_grid_attach (GTK_GRID (grid), label, 0, grid_vertical, 1, 1); + + display_scale_range = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, + DISPLAY_SCALE_MIN, DISPLAY_SCALE_MAX, 1); + gtk_scale_set_value_pos (GTK_SCALE (display_scale_range), GTK_POS_RIGHT); + gtk_widget_set_size_request (display_scale_range, 230, -1); + gtk_grid_attach (GTK_GRID (grid), display_scale_range, 1, grid_vertical, 1, 1); + + grid_vertical++; + + label = gtk_label_new (_("Caps Lock indicator:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.f); + gtk_widget_set_hexpand (label, TRUE); + gtk_grid_attach (GTK_GRID (grid), label, 0, grid_vertical, 1, 1); + + caps_lock_indicator_switch = gtk_switch_new (); + gtk_widget_set_halign (caps_lock_indicator_switch, GTK_ALIGN_END); + gtk_widget_set_valign (caps_lock_indicator_switch, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), caps_lock_indicator_switch, 1, grid_vertical, 1, 1); + + grid_vertical++; + + label = gtk_label_new (_("Tooltip icon:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.f); + gtk_widget_set_hexpand (label, TRUE); + gtk_grid_attach (GTK_GRID (grid), label, 0, grid_vertical, 1, 1); + + display_tooltip_icon_switch = gtk_switch_new (); + gtk_widget_set_halign (display_tooltip_icon_switch, GTK_ALIGN_END); + gtk_widget_set_valign (display_tooltip_icon_switch, GTK_ALIGN_CENTER); + gtk_grid_attach (GTK_GRID (grid), display_tooltip_icon_switch, 1, grid_vertical, 1, 1); + + grid_vertical = 0; + + frame = xfce_gtk_frame_box_new (_("Behavior"), &bin); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 2); + + grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (grid), 6); + gtk_grid_set_column_spacing (GTK_GRID (grid), 18); + gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE); + gtk_widget_set_size_request (grid, -1, -1); + gtk_container_add (GTK_CONTAINER (bin), grid); + + label = gtk_label_new (_("Manage layout:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.f); + gtk_widget_set_hexpand (label, TRUE); + gtk_grid_attach (GTK_GRID (grid), label, 0, grid_vertical, 1, 1); + + group_policy_combo = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (group_policy_combo), _("globally")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (group_policy_combo), _("per window")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (group_policy_combo), _("per application")); + gtk_widget_set_size_request (group_policy_combo, 230, -1); + gtk_grid_attach (GTK_GRID (grid), group_policy_combo, 1, grid_vertical, 1, 1); + + gtk_widget_show_all (vbox); + + g_signal_connect_swapped (settings_dialog, "response", + G_CALLBACK (xfce_panel_plugin_unblock_menu), plugin); + g_signal_connect (settings_dialog, "response", + G_CALLBACK (gtk_widget_destroy), NULL); + + g_object_bind_property (G_OBJECT (config), DISPLAY_TYPE, + G_OBJECT (display_type_combo), "active", + G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); + + g_object_bind_property (G_OBJECT (config), DISPLAY_NAME, + G_OBJECT (display_name_combo), "active", + G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); + + g_object_bind_property (G_OBJECT (config), DISPLAY_SCALE, + G_OBJECT (gtk_range_get_adjustment (GTK_RANGE (display_scale_range))), "value", + G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); + + g_object_bind_property (G_OBJECT (config), CAPS_LOCK_INDICATOR, + G_OBJECT (caps_lock_indicator_switch), "active", + G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); + + g_object_bind_property (G_OBJECT (config), DISPLAY_TOOLTIP_ICON, + G_OBJECT (display_tooltip_icon_switch), "active", + G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); + + g_object_bind_property (G_OBJECT (config), GROUP_POLICY, + G_OBJECT (group_policy_combo), "active", + G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); + + g_object_bind_property_full (G_OBJECT (display_type_combo), "active", + G_OBJECT (display_scale_range), "sensitive", + G_BINDING_SYNC_CREATE, + xkb_dialog_transform_scale_range_for_display_type, + NULL, NULL, NULL); + + g_object_bind_property_full (G_OBJECT (display_type_combo), "active", + G_OBJECT (caps_lock_indicator_switch), "sensitive", + G_BINDING_SYNC_CREATE, + xkb_dialog_transform_scale_range_for_caps_lock_indicator, + NULL, NULL, NULL); + + gtk_widget_set_has_tooltip (display_scale_range, TRUE); + g_signal_connect (display_scale_range, "query-tooltip", + G_CALLBACK (xkb_dialog_set_style_warning_tooltip), NULL); + + gtk_widget_set_has_tooltip (caps_lock_indicator_switch, TRUE); + g_signal_connect (caps_lock_indicator_switch, "query-tooltip", + G_CALLBACK (xkb_dialog_set_style_warning_tooltip), NULL); + + gtk_widget_show (settings_dialog); +} + + + +void +xkb_dialog_about_show (void) +{ + GdkPixbuf *icon; + + const gchar* authors[] = + { + "Alexander Iliev ", + "Gauvain Pocentek ", + "Igor Slepchin ", + NULL + }; + + icon = xfce_panel_pixbuf_from_source ("preferences-desktop-keyboard", NULL, 32); + + gtk_show_about_dialog (NULL, + "logo", icon, + "program-name", _("Keyboard Layouts Plugin"), + "version", PACKAGE_VERSION, + "comments", _("Allows you to configure and use multiple keyboard layouts."), + "website", "https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin", + "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL), + "authors", authors, + NULL); + + if (icon) + g_object_unref (G_OBJECT (icon)); +} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-dialog.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-dialog.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-dialog.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-dialog.h 2017-06-22 07:53:27.000000000 +0000 @@ -0,0 +1,38 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-dialog.h + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * A part of this file comes from the gnome keyboard capplet (control-center): + * Copyright (C) 2003 Sergey V. Oudaltsov + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __XKB_SETTINGS_DIALOG_H__ +#define __XKB_SETTINGS_DIALOG_H__ + +#include + +#include "xkb-xfconf.h" + +void xkb_dialog_configure_plugin (XfcePanelPlugin *plugin, + XkbXfconf *config); +void xkb_dialog_about_show (void); + +#endif + diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-keyboard.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-keyboard.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-keyboard.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-keyboard.c 2017-07-26 19:29:22.000000000 +0000 @@ -0,0 +1,885 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-keyboard.c + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * A part of this file comes from the gnome keyboard capplet (control-center): + * Copyright (C) 2003 Sergey V. Oudaltsov + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "xkb-keyboard.h" +#include "xkb-util.h" + +#include +#include +#include +#include + +typedef struct +{ + gchar *country_name; + gint country_index; + gchar *language_name; + gint language_index; + gchar *variant; + gchar *pretty_layout_name; + GdkPixbuf *display_pixbuf; + GdkPixbuf *tooltip_pixbuf; +} XkbGroupData; + +struct _XkbKeyboardClass +{ + GObjectClass __parent__; +}; + +struct _XkbKeyboard +{ + GObject __parent__; + + XklEngine *engine; + XklConfigRec *last_config_rec; + + XkbXfconf *config; + WnckScreen *wnck_screen; + + guint config_timeout_id; + + XkbGroupData *group_data; + + XkbGroupPolicy group_policy; + + GHashTable *application_map; + GHashTable *window_map; + + guint current_window_id; + guint current_application_id; + + gint group_count; + gint current_group; + + gulong active_window_changed_handler_id; + gulong application_closed_handler_id; + gulong window_closed_handler_id; +}; + +static void xkb_keyboard_group_policy_changed (XkbKeyboard *keyboard); + +static void xkb_keyboard_active_window_changed (WnckScreen *screen, + WnckWindow *previously_active_window, + XkbKeyboard *keyboard); +static void xkb_keyboard_application_closed (WnckScreen *screen, + WnckApplication *application, + XkbKeyboard *keyboard); +static void xkb_keyboard_window_closed (WnckScreen *screen, + WnckWindow *window, + XkbKeyboard *keyboard); + +static void xkb_keyboard_xkl_state_changed (XklEngine *engine, + XklEngineStateChange change, + gint group, + gboolean restore, + XkbKeyboard *keyboard); + +static void xkb_keyboard_xkl_config_changed (XklEngine *engine, + XkbKeyboard *keyboard); + +static GdkFilterReturn xkb_keyboard_handle_xevent (GdkXEvent *xev, + GdkEvent *event, + gpointer user_data); + +static void xkb_keyboard_free (XkbKeyboard *keyboard); +static void xkb_keyboard_finalize (GObject *object); +static gboolean xkb_keyboard_update_from_xkl (XkbKeyboard *keyboard); +static void xkb_keyboard_initialize_xkb_options (XkbKeyboard *keyboard, + const XklConfigRec *config_rec); + +enum +{ + STATE_CHANGED, + LAST_SIGNAL +}; + +static guint xkb_keyboard_signals[LAST_SIGNAL] = { 0, }; + +G_DEFINE_TYPE (XkbKeyboard, xkb_keyboard, G_TYPE_OBJECT) + + + +static void +xkb_keyboard_class_init (XkbKeyboardClass *klass) +{ + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = xkb_keyboard_finalize; + + xkb_keyboard_signals[STATE_CHANGED] = + g_signal_new (g_intern_static_string ("state-changed"), + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, 1, G_TYPE_BOOLEAN); +} + + + +static void +xkb_keyboard_init (XkbKeyboard *keyboard) +{ + keyboard->engine = NULL; + keyboard->last_config_rec = NULL; + + keyboard->config = NULL; + keyboard->wnck_screen = NULL; + + keyboard->config_timeout_id = 0; + + keyboard->group_data = NULL; + keyboard->group_policy = GROUP_POLICY_GLOBAL; + + keyboard->application_map = NULL; + keyboard->window_map = NULL; + + keyboard->current_window_id = 0; + keyboard->current_application_id = 0; + + keyboard->group_count = 0; + keyboard->current_group = 0; + + keyboard->active_window_changed_handler_id = 0; + keyboard->application_closed_handler_id = 0; + keyboard->window_closed_handler_id = 0; +} + + + +XkbKeyboard * +xkb_keyboard_new (XkbXfconf *config) +{ + XkbKeyboard *keyboard; + + keyboard = g_object_new (TYPE_XKB_KEYBOARD, NULL); + + keyboard->group_policy = xkb_xfconf_get_group_policy (config); + + g_signal_connect_swapped (G_OBJECT (config), "notify::" GROUP_POLICY, + G_CALLBACK (xkb_keyboard_group_policy_changed), keyboard); + + g_object_ref (config); + keyboard->config = config; + + keyboard->wnck_screen = wnck_screen_get_default (); + + keyboard->engine = xkl_engine_get_instance (gdk_x11_get_default_xdisplay ()); + + if (keyboard->engine) + { + xkb_keyboard_update_from_xkl (keyboard); + + xkl_engine_set_group_per_toplevel_window (keyboard->engine, FALSE); + + xkl_engine_start_listen (keyboard->engine, XKLL_TRACK_KEYBOARD_STATE); + + g_signal_connect (keyboard->engine, "X-state-changed", + G_CALLBACK (xkb_keyboard_xkl_state_changed), keyboard); + g_signal_connect (keyboard->engine, "X-config-changed", + G_CALLBACK (xkb_keyboard_xkl_config_changed), keyboard); + + gdk_window_add_filter (NULL, xkb_keyboard_handle_xevent, keyboard); + + keyboard->active_window_changed_handler_id = + g_signal_connect (G_OBJECT (keyboard->wnck_screen), "active-window-changed", + G_CALLBACK (xkb_keyboard_active_window_changed), keyboard); + keyboard->application_closed_handler_id = + g_signal_connect (G_OBJECT (keyboard->wnck_screen), "application-closed", + G_CALLBACK (xkb_keyboard_application_closed), keyboard); + keyboard->window_closed_handler_id = + g_signal_connect (G_OBJECT (keyboard->wnck_screen), "window-closed", + G_CALLBACK (xkb_keyboard_window_closed), keyboard); + } + + return keyboard; +} + + + +gboolean +xkb_keyboard_get_initialized (XkbKeyboard *keyboard) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), FALSE); + + return G_LIKELY (keyboard->engine != NULL); +} + + + +static gchar * +xkb_keyboard_xkb_description (XklConfigItem *config_item) +{ + gchar *ci_description; + gchar *description; + + ci_description = g_strstrip (config_item->description); + + if (ci_description[0] == 0) + description = g_strdup (config_item->name); + else + description = g_strdup (ci_description); + + return description; +} + + + +static gchar* +xkb_keyboard_create_pretty_layout_name (XklConfigRegistry *registry, + XklConfigItem *config_item, + gchar *layout_name, + gchar *layout_variant) +{ + gchar *pretty_layout_name; + + g_snprintf (config_item->name, sizeof (config_item->name), + "%s", layout_variant); + if (xkl_config_registry_find_variant (registry, layout_name, config_item)) + { + pretty_layout_name = xkb_keyboard_xkb_description (config_item); + } + else + { + g_snprintf (config_item->name, sizeof (config_item->name), + "%s", layout_name); + if (xkl_config_registry_find_layout (registry, config_item)) + pretty_layout_name = xkb_keyboard_xkb_description (config_item); + else + pretty_layout_name = xkb_util_get_layout_string (layout_name, layout_variant); + } + + return pretty_layout_name; +} + + + +static gchar * +xkb_keyboard_obtain_language_name (XklConfigRegistry *registry, + XklConfigItem *config_item, + gchar *layout_name) +{ + g_snprintf (config_item->name, sizeof (config_item->name), + "%s", layout_name); + + if (xkl_config_registry_find_layout (registry, config_item)) + return g_strdup (config_item->short_description); + else + return g_strdup (layout_name); +} + + + +static void +xkb_keyboard_initialize_xkb_options (XkbKeyboard *keyboard, + const XklConfigRec *config_rec) +{ + GHashTable *country_indexes, *language_indexes; + gchar **group; + gint val, i; + gpointer pval; + gchar *imgfilename; + XklConfigRegistry *registry; + XklConfigItem *config_item; + + xkb_keyboard_free (keyboard); + + group = config_rec->layouts; + keyboard->group_count = 0; + while (*group) + { + group++; + keyboard->group_count++; + } + + keyboard->window_map = g_hash_table_new (g_direct_hash, NULL); + keyboard->application_map = g_hash_table_new (g_direct_hash, NULL); + keyboard->group_data = (XkbGroupData *) g_new0 (XkbGroupData, keyboard->group_count); + country_indexes = g_hash_table_new (g_str_hash, g_str_equal); + language_indexes = g_hash_table_new (g_str_hash, g_str_equal); + + registry = xkl_config_registry_get_instance (keyboard->engine); + xkl_config_registry_load (registry, FALSE); + config_item = xkl_config_item_new (); + + for (i = 0; i < keyboard->group_count; i++) + { + XkbGroupData *group_data = &keyboard->group_data[i]; + RsvgHandle *handle; + + group_data->country_name = g_strdup (config_rec->layouts[i]); + + group_data->variant = (config_rec->variants[i] == NULL) + ? g_strdup ("") : g_strdup (config_rec->variants[i]); + + group_data->pretty_layout_name = + xkb_keyboard_create_pretty_layout_name (registry, + config_item, + group_data->country_name, + group_data->variant); + + group_data->language_name = + xkb_keyboard_obtain_language_name (registry, + config_item, + group_data->country_name); + + #define MODIFY_INDEXES(table, name, index) \ + pval = g_hash_table_lookup (table, group_data->name); \ + val = (pval != NULL) ? GPOINTER_TO_INT (pval) : 0; \ + val++; \ + group_data->index = val; \ + g_hash_table_insert (table, group_data->name, GINT_TO_POINTER (val)); + + MODIFY_INDEXES (country_indexes, country_name, country_index); + MODIFY_INDEXES (language_indexes, language_name, language_index); + + #undef MODIFY_INDEXES + + imgfilename = xkb_util_get_flag_filename (group_data->country_name); + handle = rsvg_handle_new_from_file (imgfilename, NULL); + if (handle) + { + group_data->display_pixbuf = rsvg_handle_get_pixbuf (handle); + group_data->tooltip_pixbuf = gdk_pixbuf_scale_simple (group_data->display_pixbuf, + 30, 22, GDK_INTERP_BILINEAR); + rsvg_handle_close (handle, NULL); + g_object_unref (handle); + } + g_free (imgfilename); + } + + g_object_unref (config_item); + g_object_unref (registry); + g_hash_table_destroy (country_indexes); + g_hash_table_destroy (language_indexes); +} + + + +static void +xkb_keyboard_free (XkbKeyboard *keyboard) +{ + gint i; + XkbGroupData *group_data; + + if (keyboard->window_map) + g_hash_table_destroy (keyboard->window_map); + + if (keyboard->application_map) + g_hash_table_destroy (keyboard->application_map); + + if (keyboard->group_data) + { + for (i = 0; i < keyboard->group_count; i++) + { + group_data = &keyboard->group_data[i]; + + g_free (group_data->country_name); + g_free (group_data->language_name); + g_free (group_data->variant); + g_free (group_data->pretty_layout_name); + + if (group_data->display_pixbuf) + g_object_unref (group_data->display_pixbuf); + + if (group_data->tooltip_pixbuf) + g_object_unref (group_data->tooltip_pixbuf); + } + + g_free (keyboard->group_data); + } +} + + + +static void +xkb_keyboard_finalize (GObject *object) +{ + XkbKeyboard *keyboard = XKB_KEYBOARD (object); + + if (keyboard->engine) + { + xkl_engine_stop_listen (keyboard->engine, XKLL_TRACK_KEYBOARD_STATE); + g_object_unref (keyboard->engine); + + gdk_window_remove_filter (NULL, xkb_keyboard_handle_xevent, keyboard); + } + + xkb_keyboard_free (keyboard); + + if (keyboard->last_config_rec != NULL) + g_object_unref (keyboard->last_config_rec); + + if (keyboard->config_timeout_id != 0) + g_source_remove (keyboard->config_timeout_id); + + if (keyboard->active_window_changed_handler_id > 0) + g_signal_handler_disconnect (keyboard->wnck_screen, keyboard->active_window_changed_handler_id); + + if (keyboard->application_closed_handler_id > 0) + g_signal_handler_disconnect (keyboard->wnck_screen, keyboard->application_closed_handler_id); + + if (keyboard->window_closed_handler_id > 0) + g_signal_handler_disconnect (keyboard->wnck_screen, keyboard->window_closed_handler_id); + + g_object_unref (keyboard->config); + + G_OBJECT_CLASS (xkb_keyboard_parent_class)->finalize (object); +} + + + +gboolean +xkb_keyboard_set_group (XkbKeyboard *keyboard, + gint group) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), FALSE); + + if (G_UNLIKELY (keyboard->engine == NULL || group < 0 || group >= keyboard->group_count)) + return FALSE; + + xkl_engine_lock_group (keyboard->engine, group); + keyboard->current_group = group; + + return TRUE; +} + + + +gboolean +xkb_keyboard_next_group (XkbKeyboard *keyboard) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), FALSE); + + if (G_UNLIKELY (keyboard->engine == NULL)) + return FALSE; + + xkl_engine_lock_group (keyboard->engine, xkl_engine_get_next_group (keyboard->engine)); + + return TRUE; +} + + + +gboolean +xkb_keyboard_prev_group (XkbKeyboard *keyboard) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), FALSE); + + if (G_UNLIKELY (keyboard->engine == NULL)) + return FALSE; + + xkl_engine_lock_group (keyboard->engine, xkl_engine_get_prev_group (keyboard->engine)); + + return TRUE; +} + + + +static void +xkb_keyboard_group_policy_changed (XkbKeyboard *keyboard) +{ + keyboard->group_policy = xkb_xfconf_get_group_policy (keyboard->config); +} + + + +static gboolean +xkb_keyboard_xkl_config_rec_equals (const XklConfigRec *rec1, + const XklConfigRec *rec2) +{ + gint i; + + g_return_val_if_fail (XKL_IS_CONFIG_REC (rec1), FALSE); + g_return_val_if_fail (XKL_IS_CONFIG_REC (rec2), FALSE); + + #define STRING_ARRAYS_NOT_EQUAL_RETURN(array1, array2) \ + for (i = 0; array1[i] || array2[i]; i++) \ + { \ + if (!array1[i] || !array2[i] || g_ascii_strcasecmp (array1[i], array2[i]) != 0) \ + return FALSE; \ + } + + STRING_ARRAYS_NOT_EQUAL_RETURN (rec1->layouts, rec2->layouts); + STRING_ARRAYS_NOT_EQUAL_RETURN (rec1->variants, rec2->variants); + + #undef STRING_ARRAYS_NOT_EQUAL_RETURN + + return TRUE; +} + + + +static gboolean +xkb_keyboard_update_from_xkl (XkbKeyboard *keyboard) +{ + XklConfigRec *config_rec; + + config_rec = xkl_config_rec_new (); + xkl_config_rec_get_from_server (config_rec, keyboard->engine); + + if (keyboard->last_config_rec == NULL || + !xkb_keyboard_xkl_config_rec_equals (config_rec, keyboard->last_config_rec)) + { + xkb_keyboard_initialize_xkb_options (keyboard, config_rec); + + if (keyboard->last_config_rec != NULL) + g_object_unref (keyboard->last_config_rec); + + keyboard->last_config_rec = config_rec; + + return TRUE; + } + else + { + g_object_unref (config_rec); + + return FALSE; + } +} + + + +static void +xkb_keyboard_active_window_changed (WnckScreen *screen, + WnckWindow *previously_active_window, + XkbKeyboard *keyboard) +{ + gint group = 0; + gpointer key, value; + GHashTable *hashtable = NULL; + guint id = 0; + WnckWindow *window; + guint window_id, application_id; + + g_return_if_fail (IS_XKB_KEYBOARD (keyboard)); + + window = wnck_screen_get_active_window (screen); + + if (!WNCK_IS_WINDOW (window)) + return; + + window_id = wnck_window_get_xid (window); + application_id = wnck_window_get_pid (window); + + switch (keyboard->group_policy) + { + case GROUP_POLICY_GLOBAL: + return; + + case GROUP_POLICY_PER_WINDOW: + hashtable = keyboard->window_map; + id = window_id; + keyboard->current_window_id = id; + break; + + case GROUP_POLICY_PER_APPLICATION: + hashtable = keyboard->application_map; + id = application_id; + keyboard->current_application_id = id; + break; + } + + if (g_hash_table_lookup_extended (hashtable, GINT_TO_POINTER (id), &key, &value)) + group = GPOINTER_TO_INT (value); + else + g_hash_table_insert (hashtable, GINT_TO_POINTER (id), GINT_TO_POINTER (group)); + + xkb_keyboard_set_group (keyboard, group); +} + + + +static void +xkb_keyboard_application_closed (WnckScreen *screen, + WnckApplication *application, + XkbKeyboard *keyboard) +{ + guint application_id; + + g_return_if_fail (IS_XKB_KEYBOARD (keyboard)); + + application_id = wnck_application_get_pid (application); + + switch (keyboard->group_policy) + { + case GROUP_POLICY_GLOBAL: + case GROUP_POLICY_PER_WINDOW: + break; + + case GROUP_POLICY_PER_APPLICATION: + g_hash_table_remove (keyboard->application_map, GINT_TO_POINTER (application_id)); + break; + } +} + + + +static void +xkb_keyboard_window_closed (WnckScreen *screen, + WnckWindow *window, + XkbKeyboard *keyboard) +{ + guint window_id; + + g_return_if_fail (IS_XKB_KEYBOARD (keyboard)); + + window_id = wnck_window_get_xid (window); + + switch (keyboard->group_policy) + { + case GROUP_POLICY_GLOBAL: + case GROUP_POLICY_PER_APPLICATION: + break; + + case GROUP_POLICY_PER_WINDOW: + g_hash_table_remove (keyboard->window_map, GINT_TO_POINTER (window_id)); + break; + } +} + + + +gint +xkb_keyboard_get_group_count (XkbKeyboard *keyboard) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), 0); + + return keyboard->group_count; +} + + + +guint +xkb_keyboard_get_max_group_count (XkbKeyboard *keyboard) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), 0); + + if (G_UNLIKELY (keyboard->engine == NULL)) + return 0; + + return xkl_engine_get_max_num_groups(keyboard->engine); +} + + + +const gchar* +xkb_keyboard_get_group_name (XkbKeyboard *keyboard, + XkbDisplayName display_name, + gint group) +{ + XkbGroupData *group_data; + + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), NULL); + + if (group == -1) + group = xkb_keyboard_get_current_group (keyboard); + + if (G_UNLIKELY (group < 0 || group >= keyboard->group_count)) + return NULL; + + group_data = &keyboard->group_data[group]; + + switch (display_name) + { + case DISPLAY_NAME_COUNTRY: + return group_data->country_name; + + case DISPLAY_NAME_LANGUAGE: + return group_data->language_name; + + default: + return ""; + } +} + + + +gint +xkb_keyboard_get_variant_index (XkbKeyboard *keyboard, + XkbDisplayName display_name, + gint group) +{ + XkbGroupData *group_data; + + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), 0); + + if (group == -1) + group = xkb_keyboard_get_current_group (keyboard); + + if (G_UNLIKELY (group < 0 || group >= keyboard->group_count)) + return 0; + + group_data = &keyboard->group_data[group]; + + switch (display_name) + { + case DISPLAY_NAME_COUNTRY: + return group_data->country_index - 1; + + case DISPLAY_NAME_LANGUAGE: + return group_data->language_index - 1; + + default: + return 0; + } +} + + + +static void +xkb_keyboard_xkl_state_changed (XklEngine *engine, + XklEngineStateChange change, + gint group, + gboolean restore, + XkbKeyboard *keyboard) +{ + if (change == GROUP_CHANGED) + { + keyboard->current_group = group; + + switch (keyboard->group_policy) + { + case GROUP_POLICY_GLOBAL: + break; + + case GROUP_POLICY_PER_WINDOW: + g_hash_table_insert (keyboard->window_map, + GINT_TO_POINTER (keyboard->current_window_id), + GINT_TO_POINTER (group)); + break; + + case GROUP_POLICY_PER_APPLICATION: + g_hash_table_insert (keyboard->application_map, + GINT_TO_POINTER (keyboard->current_application_id), + GINT_TO_POINTER (group)); + break; + } + + g_signal_emit (G_OBJECT (keyboard), + xkb_keyboard_signals[STATE_CHANGED], + 0, FALSE); + } +} + + + +static gboolean +xkb_keyboard_xkl_config_changed_timeout (gpointer user_data) +{ + XkbKeyboard *keyboard = user_data; + gboolean updated; + + updated = xkb_keyboard_update_from_xkl (keyboard); + + if (updated) + { + xkb_keyboard_set_group (keyboard, 0); + + g_signal_emit (G_OBJECT (keyboard), + xkb_keyboard_signals[STATE_CHANGED], + 0, TRUE); + } + + keyboard->config_timeout_id = 0; + + return G_SOURCE_REMOVE; +} + + + +static void +xkb_keyboard_xkl_config_changed (XklEngine *engine, + XkbKeyboard *keyboard) +{ + if (keyboard->config_timeout_id != 0) + g_source_remove (keyboard->config_timeout_id); + + keyboard->config_timeout_id = g_timeout_add (100, xkb_keyboard_xkl_config_changed_timeout, keyboard); +} + + + +static GdkFilterReturn +xkb_keyboard_handle_xevent (GdkXEvent *xev, + GdkEvent *event, + gpointer user_data) +{ + XkbKeyboard *keyboard = user_data; + XEvent *xevent = (XEvent *) xev; + + xkl_engine_filter_events (keyboard->engine, xevent); + + return GDK_FILTER_CONTINUE; +} + + + +GdkPixbuf * +xkb_keyboard_get_pixbuf (XkbKeyboard *keyboard, + gboolean tooltip, + gint group) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), NULL); + + if (group == -1) + group = xkb_keyboard_get_current_group (keyboard); + + if (G_UNLIKELY (group < 0 || group >= keyboard->group_count)) + return 0; + + if (tooltip) + return keyboard->group_data[group].tooltip_pixbuf; + else + return keyboard->group_data[group].display_pixbuf; +} + + + +gchar* +xkb_keyboard_get_pretty_layout_name (XkbKeyboard *keyboard, + gint group) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), NULL); + + if (group == -1) + group = xkb_keyboard_get_current_group (keyboard); + + if (G_UNLIKELY (group < 0 || group >= keyboard->group_count)) + return 0; + + return keyboard->group_data[group].pretty_layout_name; +} + + + +gint +xkb_keyboard_get_current_group (XkbKeyboard *keyboard) +{ + g_return_val_if_fail (IS_XKB_KEYBOARD (keyboard), 0); + + return keyboard->current_group; +} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-keyboard.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-keyboard.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-keyboard.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-keyboard.h 2017-06-22 07:53:27.000000000 +0000 @@ -0,0 +1,75 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-keyboard.h + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * A part of this file comes from the gnome keyboard capplet (control-center): + * Copyright (C) 2003 Sergey V. Oudaltsov + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _xkb_keyboard_H_ +#define _xkb_keyboard_H_ + +#include + +#include "xkb-xfconf.h" +#include "xkb-properties.h" + +G_BEGIN_DECLS + +typedef struct _XkbKeyboardClass XkbKeyboardClass; +typedef struct _XkbKeyboard XkbKeyboard; + +#define TYPE_XKB_KEYBOARD (xkb_keyboard_get_type ()) +#define XKB_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_XKB_KEYBOARD, XkbKeyboard)) +#define XKB_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_XKB_KEYBOARD, XkbKeyboardClass)) +#define IS_XKB_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_XKB_KEYBOARD)) +#define IS_XKB_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_XKB_KEYBOARD)) +#define XKB_KEYBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_XKB_KEYBOARD, XkbKeyboard)) + +GType xkb_keyboard_get_type (void) G_GNUC_CONST; + +XkbKeyboard *xkb_keyboard_new (XkbXfconf *config); + +gboolean xkb_keyboard_get_initialized (XkbKeyboard *keyboard); + +gint xkb_keyboard_get_group_count (XkbKeyboard *keyboard); +guint xkb_keyboard_get_max_group_count (XkbKeyboard *keyboard); +const gchar* xkb_keyboard_get_group_name (XkbKeyboard *keyboard, + XkbDisplayName display_name, + gint group); +gint xkb_keyboard_get_variant_index (XkbKeyboard *keyboard, + XkbDisplayName display_name, + gint group); + +gboolean xkb_keyboard_set_group (XkbKeyboard *keyboard, + gint group); +gboolean xkb_keyboard_next_group (XkbKeyboard *keyboard); +gboolean xkb_keyboard_prev_group (XkbKeyboard *keyboard); + +GdkPixbuf* xkb_keyboard_get_pixbuf (XkbKeyboard *keyboard, + gboolean tooltip, + gint group); +gchar* xkb_keyboard_get_pretty_layout_name (XkbKeyboard *keyboard, + gint group); +gint xkb_keyboard_get_current_group (XkbKeyboard *keyboard); + +G_END_DECLS + +#endif diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-modifier.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-modifier.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-modifier.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-modifier.c 2017-06-28 21:04:55.000000000 +0000 @@ -0,0 +1,190 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-modifier.c + * Copyright (C) 2017 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "xkb-modifier.h" + +#include +#include +#include + +struct _XkbModifierClass +{ + GObjectClass __parent__; +}; + +struct _XkbModifier +{ + GObject __parent__; + + gint xkb_event_type; + gboolean caps_lock_enabled; +}; + +static GdkFilterReturn xkb_modifier_handle_xevent (GdkXEvent *xev, + GdkEvent *event, + gpointer user_data); + +static void xkb_modifier_finalize (GObject *object); + +enum +{ + MODIFIER_CHANGED, + LAST_SIGNAL +}; + +static guint xkb_modifier_signals[LAST_SIGNAL] = { 0, }; + +G_DEFINE_TYPE (XkbModifier, xkb_modifier, G_TYPE_OBJECT) + + + +static void +xkb_modifier_class_init (XkbModifierClass *klass) +{ + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = xkb_modifier_finalize; + + xkb_modifier_signals[MODIFIER_CHANGED] = + g_signal_new (g_intern_static_string ("modifier-changed"), + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); +} + + + +static void +xkb_modifier_init (XkbModifier *modifier) +{ + modifier->xkb_event_type = 0; + modifier->caps_lock_enabled = FALSE; +} + + + +XkbModifier * +xkb_modifier_new (void) +{ + XkbModifier *modifier; + Display *display; + XkbDescRec *xkb_desc; + gint i, states, caps_lock_mask; + gchar *atom_name; + + modifier = g_object_new (TYPE_XKB_MODIFIER, NULL); + + /* obtain xkb_event type and caps lock state */ + display = XOpenDisplay (NULL); + if (display != NULL) + { + XkbDescRec *xkb_desc = XkbGetKeyboard (display, XkbAllComponentsMask, XkbUseCoreKbd); + if (xkb_desc != NULL) + { + for (i = 0; i < XkbNumIndicators; i++) + { + if (xkb_desc->names->indicators[i]) + { + atom_name = XGetAtomName (display, xkb_desc->names->indicators[i]); + if (g_strcmp0 (atom_name, "Caps Lock") == 0) + { + if (XkbGetIndicatorState (display, XkbUseCoreKbd, &states) == Success) + { + caps_lock_mask = 1 << i; + modifier->caps_lock_enabled = (states & caps_lock_mask) == caps_lock_mask; + } + + break; + } + } + } + + XkbFreeKeyboard(xkb_desc, 0, True); + } + + XkbQueryExtension(display, NULL, &modifier->xkb_event_type, NULL, NULL, NULL); + XCloseDisplay(display); + } + + gdk_window_add_filter (NULL, xkb_modifier_handle_xevent, modifier); + + return modifier; +} + + + +static void +xkb_modifier_finalize (GObject *object) +{ + XkbModifier *modifier = XKB_MODIFIER (object); + + gdk_window_remove_filter (NULL, xkb_modifier_handle_xevent, modifier); + + G_OBJECT_CLASS (xkb_modifier_parent_class)->finalize (object); +} + + + +static GdkFilterReturn +xkb_modifier_handle_xevent (GdkXEvent *xev, + GdkEvent *event, + gpointer user_data) +{ + XkbModifier *modifier = user_data; + Display *display; + XkbStateNotifyEvent *state_event = xev; + gint modifier_flags; + + if (modifier->xkb_event_type != 0 && + state_event->type == modifier->xkb_event_type && + state_event->xkb_type == XkbStateNotify && + state_event->changed & XkbModifierLockMask) + { + display = XOpenDisplay (NULL); + + if (display != NULL) + { + modifier_flags = XkbKeysymToModifiers (display, XK_Caps_Lock); + modifier->caps_lock_enabled = (state_event->locked_mods & modifier_flags) == modifier_flags; + XCloseDisplay (display); + + g_signal_emit (G_OBJECT (modifier), + xkb_modifier_signals[MODIFIER_CHANGED], + 0, FALSE); + } + } + + return GDK_FILTER_CONTINUE; +} + + + +gboolean +xkb_modifier_get_caps_lock_enabled (XkbModifier *modifier) +{ + g_return_val_if_fail (IS_XKB_MODIFIER (modifier), 0); + + return modifier->caps_lock_enabled; +} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-modifier.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-modifier.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-modifier.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-modifier.h 2017-06-28 21:04:55.000000000 +0000 @@ -0,0 +1,48 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-keyboard.h + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _xkb_modifier_H_ +#define _xkb_modifier_H_ + +#include + +G_BEGIN_DECLS + +typedef struct _XkbModifierClass XkbModifierClass; +typedef struct _XkbModifier XkbModifier; + +#define TYPE_XKB_MODIFIER (xkb_modifier_get_type ()) +#define XKB_MODIFIER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_XKB_MODIFIER, XkbModifier)) +#define XKB_MODIFIER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_XKB_MODIFIER, XkbModifierClass)) +#define IS_XKB_MODIFIER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_XKB_MODIFIER)) +#define IS_XKB_MODIFIER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_XKB_MODIFIER)) +#define XKB_MODIFIER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_XKB_MODIFIER, XkbModifier)) + +GType xkb_modifier_get_type (void) G_GNUC_CONST; + +XkbModifier *xkb_modifier_new (void); + +gboolean xkb_modifier_get_caps_lock_enabled (XkbModifier *modifier); + +G_END_DECLS + +#endif diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-plugin.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-plugin.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-plugin.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-plugin.c 2017-07-26 19:29:22.000000000 +0000 @@ -0,0 +1,691 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-plugin.c + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * A part of this file comes from the gnome keyboard capplet (control-center): + * Copyright (C) 2003 Sergey V. Oudaltsov + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "xkb-plugin.h" +#include "xkb-properties.h" +#include "xkb-keyboard.h" +#include "xkb-modifier.h" +#include "xkb-dialog.h" +#include "xkb-cairo.h" + +typedef struct +{ + XkbPlugin *plugin; + gint group; +} MenuItemData; + +struct _XkbPluginClass +{ + XfcePanelPluginClass __parent__; +}; + +struct _XkbPlugin +{ + XfcePanelPlugin __parent__; + + XkbXfconf *config; + XkbKeyboard *keyboard; + XkbModifier *modifier; + + GtkWidget *button; + GtkWidget *layout_image; + GtkWidget *popup; + MenuItemData *popup_user_data; +}; + +/* ------------------------------------------------------------------ * + * Panel Plugin Interface * + * ------------------------------------------------------------------ */ + +static void xkb_plugin_construct (XfcePanelPlugin *plugin); +static void xkb_plugin_orientation_changed (XfcePanelPlugin *plugin, + GtkOrientation orientation); +static gboolean xkb_plugin_size_changed (XfcePanelPlugin *plugin, + gint size); +static void xkb_plugin_free_data (XfcePanelPlugin *plugin); +static void xkb_plugin_about_show (XfcePanelPlugin *plugin); +static void xkb_plugin_configure_plugin (XfcePanelPlugin *plugin); + +/* ----------------------------------------------------------------- * + * XKB Stuff * + * ----------------------------------------------------------------- */ + +static void xkb_plugin_state_changed (XkbPlugin *plugin, + gboolean config_changed); + +static void xkb_plugin_modifier_changed (XkbPlugin *plugin); + +static gboolean xkb_plugin_calculate_sizes (XkbPlugin *plugin, + GtkOrientation orientation, + gint panel_size); + +static void xkb_plugin_popup_menu_populate (XkbPlugin *plugin); +static void xkb_plugin_popup_menu_destroy (XkbPlugin *plugin); +static void xkb_plugin_popup_menu_show (GtkWidget *widget, + GdkEventButton *event, + XkbPlugin *plugin); +static void xkb_plugin_popup_menu_deactivate (XkbPlugin *plugin, + GtkMenuShell *menu_shell); + +static void xkb_plugin_refresh_gui (XkbPlugin *plugin); + +static void xkb_plugin_configure_layout (GtkWidget *widget); + +static gboolean xkb_plugin_button_clicked (GtkWidget *widget, + GdkEventButton *event, + XkbPlugin *plugin); +static gboolean xkb_plugin_button_scrolled (GtkWidget *widget, + GdkEventScroll *event, + XkbPlugin *plugin); + +static gboolean xkb_plugin_set_tooltip (GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip *tooltip, + XkbPlugin *plugin); + +static gboolean xkb_plugin_layout_image_draw (GtkWidget *widget, + cairo_t *cr, + XkbPlugin *plugin); + +static void xkb_plugin_update_size_allocation (XkbPlugin *plugin); + +/* ================================================================== * + * Implementation * + * ================================================================== */ + +XFCE_PANEL_DEFINE_PLUGIN (XkbPlugin, xkb_plugin) + + + +static void +xkb_plugin_class_init (XkbPluginClass *klass) +{ + XfcePanelPluginClass *plugin_class; + + plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass); + plugin_class->construct = xkb_plugin_construct; + plugin_class->free_data = xkb_plugin_free_data; + plugin_class->about = xkb_plugin_about_show; + plugin_class->configure_plugin = xkb_plugin_configure_plugin; + plugin_class->orientation_changed = xkb_plugin_orientation_changed; + plugin_class->size_changed = xkb_plugin_size_changed; +} + + + +static void +xkb_plugin_init (XkbPlugin *plugin) +{ + plugin->config = NULL; + plugin->keyboard = NULL; + plugin->modifier = NULL; + + plugin->button = NULL; + plugin->layout_image = NULL; + plugin->popup = NULL; + plugin->popup_user_data = NULL; +} + + + +static void +xkb_plugin_construct (XfcePanelPlugin *plugin) +{ + XkbPlugin *xkb_plugin; + GtkWidget *configure_layouts; + GtkCssProvider *css_provider; + + xkb_plugin = XKB_PLUGIN (plugin); + + xkb_plugin->config = xkb_xfconf_new (xfce_panel_plugin_get_property_base (plugin)); + + g_signal_connect_swapped (G_OBJECT (xkb_plugin->config), "notify::" DISPLAY_TYPE, + G_CALLBACK (xkb_plugin_update_size_allocation), xkb_plugin); + g_signal_connect_swapped (G_OBJECT (xkb_plugin->config), "notify::" DISPLAY_NAME, + G_CALLBACK (xkb_plugin_refresh_gui), xkb_plugin); + g_signal_connect_swapped (G_OBJECT (xkb_plugin->config), "notify::" DISPLAY_SCALE, + G_CALLBACK (xkb_plugin_refresh_gui), xkb_plugin); + g_signal_connect_swapped (G_OBJECT (xkb_plugin->config), "notify::" CAPS_LOCK_INDICATOR, + G_CALLBACK (xkb_plugin_refresh_gui), xkb_plugin); + + xkb_plugin->button = gtk_button_new (); + gtk_button_set_relief (GTK_BUTTON (xkb_plugin->button), GTK_RELIEF_NONE); + gtk_container_add (GTK_CONTAINER (plugin), xkb_plugin->button); + xfce_panel_plugin_add_action_widget (plugin, xkb_plugin->button); + gtk_widget_add_events (xkb_plugin->button, GDK_SCROLL_MASK); + + /* remove padding inside button */ + css_provider = gtk_css_provider_new (); + gtk_css_provider_load_from_data (css_provider, ".xfce4-panel button {padding: 0;}", -1, NULL); + gtk_style_context_add_provider (gtk_widget_get_style_context (xkb_plugin->button), + GTK_STYLE_PROVIDER (css_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + g_object_unref (css_provider); + + gtk_widget_show (xkb_plugin->button); + g_signal_connect (xkb_plugin->button, "button-press-event", + G_CALLBACK (xkb_plugin_button_clicked), xkb_plugin); + g_signal_connect (xkb_plugin->button, "button-release-event", + G_CALLBACK (xkb_plugin_button_clicked), xkb_plugin); + g_signal_connect (xkb_plugin->button, "scroll-event", + G_CALLBACK (xkb_plugin_button_scrolled), xkb_plugin); + + gtk_widget_set_has_tooltip (xkb_plugin->button, TRUE); + g_signal_connect (xkb_plugin->button, "query-tooltip", + G_CALLBACK (xkb_plugin_set_tooltip), xkb_plugin); + + xkb_plugin->layout_image = gtk_image_new (); + gtk_container_add (GTK_CONTAINER (xkb_plugin->button), xkb_plugin->layout_image); + g_signal_connect (G_OBJECT (xkb_plugin->layout_image), "draw", + G_CALLBACK (xkb_plugin_layout_image_draw), xkb_plugin); + gtk_widget_show (xkb_plugin->layout_image); + + xkb_plugin->keyboard = xkb_keyboard_new (xkb_plugin->config); + + g_signal_connect_swapped (G_OBJECT (xkb_plugin->keyboard), "state-changed", + G_CALLBACK (xkb_plugin_state_changed), xkb_plugin); + + if (xkb_keyboard_get_initialized (xkb_plugin->keyboard)) + { + xkb_plugin_refresh_gui (xkb_plugin); + xkb_plugin_popup_menu_populate (xkb_plugin); + } + + xkb_plugin->modifier = xkb_modifier_new (); + + g_signal_connect_swapped (G_OBJECT (xkb_plugin->modifier), "modifier-changed", + G_CALLBACK (xkb_plugin_modifier_changed), xkb_plugin); + + xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8"); + + xfce_panel_plugin_menu_show_configure (plugin); + xfce_panel_plugin_menu_show_about (plugin); + + xfce_panel_plugin_set_small (plugin, TRUE); + + configure_layouts = gtk_menu_item_new_with_label (_("Keyboard settings")); + gtk_widget_show (configure_layouts); + xfce_panel_plugin_menu_insert_item (plugin, GTK_MENU_ITEM (configure_layouts)); + + g_signal_connect (G_OBJECT (configure_layouts), "activate", + G_CALLBACK (xkb_plugin_configure_layout), NULL); +} + + + +static void +xkb_plugin_orientation_changed (XfcePanelPlugin *plugin, + GtkOrientation orientation) +{ + xkb_plugin_calculate_sizes (XKB_PLUGIN (plugin), + orientation, + xfce_panel_plugin_get_size (plugin)); +} + + + +static gboolean +xkb_plugin_size_changed (XfcePanelPlugin *plugin, + gint size) +{ + return xkb_plugin_calculate_sizes (XKB_PLUGIN (plugin), + xfce_panel_plugin_get_orientation (plugin), + size); +} + + + +static void +xkb_plugin_free_data (XfcePanelPlugin *plugin) +{ + XkbPlugin *xkb_plugin = XKB_PLUGIN (plugin); + + xkb_plugin_popup_menu_destroy (xkb_plugin); + gtk_widget_destroy (xkb_plugin->layout_image); + gtk_widget_destroy (xkb_plugin->button); + + g_object_unref (G_OBJECT (xkb_plugin->modifier)); + g_object_unref (G_OBJECT (xkb_plugin->keyboard)); + g_object_unref (G_OBJECT (xkb_plugin->config)); +} + + + +static void +xkb_plugin_about_show (XfcePanelPlugin *plugin) +{ + xkb_dialog_about_show (); +} + + + +static void +xkb_plugin_configure_plugin (XfcePanelPlugin *plugin) +{ + XkbPlugin *xkb_plugin = XKB_PLUGIN (plugin); + + xkb_dialog_configure_plugin (plugin, xkb_plugin->config); +} + + + +static void +xkb_plugin_state_changed (XkbPlugin *plugin, + gboolean config_changed) +{ + xkb_plugin_refresh_gui (plugin); + + if (config_changed) + xkb_plugin_popup_menu_populate (plugin); +} + + + +static void +xkb_plugin_modifier_changed (XkbPlugin *plugin) +{ + xkb_plugin_refresh_gui (plugin); +} + + + +static void +xkb_plugin_set_group (GtkMenuItem *item, + gpointer data) +{ + MenuItemData *item_data = data; + + xkb_keyboard_set_group (item_data->plugin->keyboard, item_data->group); +} + + + +static gboolean +xkb_plugin_calculate_sizes (XkbPlugin *plugin, + GtkOrientation orientation, + gint panel_size) +{ + guint nrows; + gint hsize, vsize; + gboolean proportional; + XkbDisplayType display_type; + + display_type = xkb_xfconf_get_display_type (plugin->config); + nrows = xfce_panel_plugin_get_nrows (XFCE_PANEL_PLUGIN (plugin)); + panel_size /= nrows; + proportional = nrows > 1 || display_type == DISPLAY_TYPE_SYSTEM; + TRACE ("calculate_sizes(%p: %d,%d)", plugin, panel_size, nrows); + + switch (orientation) + { + case GTK_ORIENTATION_HORIZONTAL: + vsize = panel_size; + + if (proportional) + hsize = panel_size; + else + hsize = (int) (1.33 * panel_size); + + gtk_widget_set_size_request (plugin->button, hsize, vsize); + break; + + case GTK_ORIENTATION_VERTICAL: + hsize = panel_size; + + if (proportional) + vsize = panel_size; + else + vsize = (int) (0.75 * panel_size); + + if (vsize < 10) + vsize = 10; + + gtk_widget_set_size_request (plugin->button, hsize, vsize); + break; + + default: + break; + } + + DBG ("size requested: h/v (%p: %d/%d), proportional: %d", + plugin, hsize, vsize, proportional); + + xkb_plugin_refresh_gui (plugin); + return TRUE; +} + + + +static void +xkb_plugin_popup_menu_destroy (XkbPlugin *plugin) +{ + if (plugin->popup != NULL) + { + gtk_menu_popdown (GTK_MENU (plugin->popup)); + gtk_menu_detach (GTK_MENU (plugin->popup)); + g_free (plugin->popup_user_data); + plugin->popup_user_data = NULL; + plugin->popup = NULL; + } +} + + + +static void +xkb_plugin_popup_menu_populate (XkbPlugin *plugin) +{ + gint i, group_count; + gchar *layout_string; + GtkWidget *menu_item; + + if (G_UNLIKELY (plugin == NULL)) + return; + + group_count = xkb_keyboard_get_group_count (plugin->keyboard); + + xkb_plugin_popup_menu_destroy (plugin); + plugin->popup = gtk_menu_new (); + plugin->popup_user_data = g_new0 (MenuItemData, group_count); + + for (i = 0; i < group_count; i++) + { + layout_string = xkb_keyboard_get_pretty_layout_name (plugin->keyboard, i); + + menu_item = gtk_menu_item_new_with_label (layout_string); + + plugin->popup_user_data[i].plugin = plugin; + plugin->popup_user_data[i].group = i; + + g_signal_connect (G_OBJECT (menu_item), "activate", + G_CALLBACK (xkb_plugin_set_group), &plugin->popup_user_data[i]); + + gtk_widget_show (menu_item); + gtk_menu_shell_append (GTK_MENU_SHELL (plugin->popup), menu_item); + } + + g_signal_connect_swapped (GTK_MENU_SHELL (plugin->popup), "deactivate", + G_CALLBACK (xkb_plugin_popup_menu_deactivate), plugin); + + gtk_menu_attach_to_widget (GTK_MENU (plugin->popup), plugin->button, NULL); +} + + + +static void +xkb_plugin_popup_menu_show (GtkWidget *widget, + GdkEventButton *event, + XkbPlugin *plugin) +{ + gtk_widget_set_state_flags (widget, GTK_STATE_FLAG_CHECKED, FALSE); +#if GTK_CHECK_VERSION(3, 22, 0) + gtk_menu_popup_at_widget (GTK_MENU (plugin->popup), widget, + GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_WEST, (GdkEvent *) event); +#else + gtk_menu_popup (GTK_MENU (plugin->popup), NULL, NULL, + xfce_panel_plugin_position_menu, xkb_plugin_get_plugin (plugin), + 0, event->time); +#endif +} + + + +static void +xkb_plugin_popup_menu_deactivate (XkbPlugin *plugin, + GtkMenuShell *menu_shell) +{ + g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); + + gtk_widget_unset_state_flags (plugin->button, GTK_STATE_FLAG_CHECKED); +} + + + +static void +xkb_plugin_refresh_gui (XkbPlugin *plugin) +{ + GdkDisplay *display; + GtkAllocation allocation; + + gtk_widget_get_allocation (plugin->button, &allocation); + + /* Part of the image may remain visible after display type change */ + gtk_widget_queue_draw_area (plugin->button, 0, 0, allocation.width, allocation.height); + + display = gdk_display_get_default (); + if (display) + gtk_tooltip_trigger_tooltip_query (display); +} + + + +static void +xkb_plugin_configure_layout (GtkWidget *widget) +{ + gchar *desktop_file; + GError *error = NULL; + gchar **argv; + gboolean succeed; + + desktop_file = xfce_resource_lookup (XFCE_RESOURCE_DATA, + "applications/xfce-keyboard-settings.desktop"); + + GarconMenuItem *item = garcon_menu_item_new_for_path (desktop_file); + + if (item) + { + g_shell_parse_argv (garcon_menu_item_get_command (item), NULL, &argv, &error); + succeed = xfce_spawn_on_screen (gtk_widget_get_screen (widget), + garcon_menu_item_get_path (item), + argv, NULL, G_SPAWN_SEARCH_PATH, + garcon_menu_item_supports_startup_notification (item), + gtk_get_current_event_time (), + garcon_menu_item_get_icon_name (item), + &error); + g_strfreev (argv); + garcon_menu_item_unref (item); + g_assert (succeed); + } + + g_free (desktop_file); +} + + + +static gboolean +xkb_plugin_button_clicked (GtkWidget *widget, + GdkEventButton *event, + XkbPlugin *plugin) +{ + gboolean released, display_popup; + + if (event->button == 1) + { + released = event->type == GDK_BUTTON_RELEASE; + display_popup = xkb_keyboard_get_group_count (plugin->keyboard) > 2; + + if (display_popup && !released) + { + xkb_plugin_popup_menu_show (widget, event, plugin); + return TRUE; + } + + if (!display_popup && released) + { + xkb_keyboard_next_group (plugin->keyboard); + return FALSE; + } + } + + return FALSE; +} + + + +static gboolean +xkb_plugin_button_scrolled (GtkWidget *button, + GdkEventScroll *event, + XkbPlugin *plugin) +{ + switch (event->direction) + { + case GDK_SCROLL_UP: + case GDK_SCROLL_RIGHT: + xkb_keyboard_next_group (plugin->keyboard); + return TRUE; + + case GDK_SCROLL_DOWN: + case GDK_SCROLL_LEFT: + xkb_keyboard_prev_group (plugin->keyboard); + return TRUE; + + default: + return FALSE; + } + + return FALSE; +} + + + +static gboolean +xkb_plugin_set_tooltip (GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip *tooltip, + XkbPlugin *plugin) +{ + gchar *layout_name; + GdkPixbuf *pixbuf; + + if (xkb_xfconf_get_display_tooltip_icon (plugin->config)) + { + pixbuf = xkb_keyboard_get_pixbuf (plugin->keyboard, TRUE, -1); + gtk_tooltip_set_icon (tooltip, pixbuf); + } + + layout_name = xkb_keyboard_get_pretty_layout_name (plugin->keyboard, -1); + + gtk_tooltip_set_text (tooltip, layout_name); + + return TRUE; +} + + + +static gboolean +xkb_plugin_layout_image_draw (GtkWidget *widget, + cairo_t *cr, + XkbPlugin *plugin) +{ + const gchar *group_name; + gint variant_index; + GdkPixbuf *pixbuf; + GtkAllocation allocation; + GtkStyleContext *style_ctx; + GtkStateFlags state; + PangoFontDescription *desc; + GdkRGBA rgba; + gint actual_hsize, actual_vsize; + XkbDisplayType display_type; + XkbDisplayName display_name; + gint display_scale; + gboolean caps_lock_indicator; + gboolean caps_lock_enabled; + + display_type = xkb_xfconf_get_display_type (plugin->config); + display_name = xkb_xfconf_get_display_name (plugin->config); + display_scale = xkb_xfconf_get_display_scale (plugin->config); + caps_lock_indicator = xkb_xfconf_get_caps_lock_indicator (plugin->config); + + gtk_widget_get_allocation (widget, &allocation); + actual_hsize = allocation.width; + actual_vsize = allocation.height; + + state = gtk_widget_get_state_flags (plugin->button); + style_ctx = gtk_widget_get_style_context (plugin->button); + gtk_style_context_get_color (style_ctx, state, &rgba); + + group_name = xkb_keyboard_get_group_name (plugin->keyboard, display_name, -1); + pixbuf = xkb_keyboard_get_pixbuf (plugin->keyboard, FALSE, -1); + variant_index = xkb_keyboard_get_variant_index (plugin->keyboard, display_name, -1); + caps_lock_enabled = xkb_modifier_get_caps_lock_enabled (plugin->modifier); + + if (pixbuf == NULL && display_type == DISPLAY_TYPE_IMAGE) + display_type = DISPLAY_TYPE_TEXT; + + DBG ("img_exposed: actual h/v (%d/%d)", actual_hsize, actual_vsize); + + switch (display_type) + { + case DISPLAY_TYPE_IMAGE: + xkb_cairo_draw_flag (cr, pixbuf, + actual_hsize, actual_vsize, + variant_index, + xkb_keyboard_get_max_group_count (plugin->keyboard), + display_scale); + break; + + case DISPLAY_TYPE_TEXT: + xkb_cairo_draw_label (cr, group_name, + actual_hsize, actual_vsize, + variant_index, + display_scale, + rgba); + break; + + case DISPLAY_TYPE_SYSTEM: + gtk_style_context_get (style_ctx, state, "font", &desc, NULL); + + xkb_cairo_draw_label_system (cr, group_name, + actual_hsize, actual_vsize, + variant_index, + caps_lock_indicator && caps_lock_enabled, + desc, rgba); + break; + } + + return FALSE; +} + + + +static void +xkb_plugin_update_size_allocation (XkbPlugin *plugin) +{ + xkb_plugin_calculate_sizes (plugin, + xfce_panel_plugin_get_orientation (XFCE_PANEL_PLUGIN (plugin)), + xfce_panel_plugin_get_size (XFCE_PANEL_PLUGIN (plugin))); +} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-plugin.desktop.in.in xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-plugin.desktop.in.in --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-plugin.desktop.in.in 2013-03-20 16:20:05.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-plugin.desktop.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -[Xfce Panel] -Type=X-XFCE-PanelPlugin -_Name=Keyboard Layouts -_Comment=Keyboard layouts setup and switch plugin -Icon=preferences-desktop-keyboard -X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-xkb-plugin -X-XFCE-Unique=TRUE diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-plugin.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-plugin.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-plugin.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-plugin.h 2017-06-09 20:05:47.000000000 +0000 @@ -0,0 +1,51 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-plugin.h + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * A part of this file comes from the gnome keyboard capplet (control-center): + * Copyright (C) 2003 Sergey V. Oudaltsov + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _XFCE_XKB_H_ +#define _XFCE_XKB_H_ + +#include + +#include "xkb-xfconf.h" + +G_BEGIN_DECLS + +typedef struct _XkbPluginClass XkbPluginClass; +typedef struct _XkbPlugin XkbPlugin; + +#define TYPE_XKB_PLUGIN (xkb_plugin_get_type ()) +#define XKB_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_XKB_PLUGIN, XkbPlugin)) +#define XKB_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_XKB_PLUGIN, XkbPluginClass)) +#define IS_XKB_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_XKB_PLUGIN)) +#define IS_XKB_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_XKB_PLUGIN)) +#define XKB_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_XKB_PLUGIN, XkbPlugin)) + +GType xkb_plugin_get_type (void) G_GNUC_CONST; + +void xkb_plugin_register_type (XfcePanelTypeModule *type_module); + +G_END_DECLS + +#endif diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-properties.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-properties.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-properties.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-properties.h 2017-06-28 21:04:55.000000000 +0000 @@ -0,0 +1,59 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-properties.h + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * A part of this file comes from the gnome keyboard capplet (control-center): + * Copyright (C) 2003 Sergey V. Oudaltsov + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _XKB_PROPERTIES_H_ +#define _XKB_PROPERTIES_H_ + +#define DISPLAY_TYPE "display-type" +#define DISPLAY_NAME "display-name" +#define DISPLAY_SCALE "display-scale" +#define CAPS_LOCK_INDICATOR "caps-lock-indicator" +#define DISPLAY_TOOLTIP_ICON "display-tooltip-icon" +#define GROUP_POLICY "group-policy" + +typedef enum +{ + DISPLAY_TYPE_IMAGE = 0, + DISPLAY_TYPE_TEXT = 1, + DISPLAY_TYPE_SYSTEM = 2 +} XkbDisplayType; + +typedef enum +{ + DISPLAY_NAME_COUNTRY = 0, + DISPLAY_NAME_LANGUAGE = 1, +} XkbDisplayName; + +#define DISPLAY_SCALE_MIN 0 +#define DISPLAY_SCALE_MAX 100 + +typedef enum +{ + GROUP_POLICY_GLOBAL = 0, + GROUP_POLICY_PER_WINDOW = 1, + GROUP_POLICY_PER_APPLICATION = 2 +} XkbGroupPolicy; + +#endif diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-settings-dialog.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-settings-dialog.c 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-settings-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,202 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xkb-settings-dialog.c - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include - -#include -#include - -#include "xfce4-xkb-plugin.h" -#include "xfce4-xkb-plugin-private.h" -#include "xkb-settings-dialog.h" -#include "xkb-util.h" - -GtkTreeIter current_iter; -GtkWidget *settings_dialog; -GtkWidget *default_layout_menu; - -enum combo_enum -{ - DESC = 0, - NOM, - COMBO_NUM -}; - -enum tree_enum -{ - DEFAULT_LAYOUT = 0, - LAYOUTS, - VARIANTS, - TREE_NUM -}; - -enum enumeration -{ - AVAIL_LAYOUT_TREE_COL_DESCRIPTION = 0, - AVAIL_LAYOUT_TREE_COL_ID, - NUM -}; - - -/**************************************************************/ - -static void -on_settings_close (GtkDialog *dialog, gint response, t_xkb *xkb) -{ - xfce_panel_plugin_unblock_menu (xkb->plugin); - - xfce_xkb_save_config (xkb->plugin, xkb); - - gtk_widget_destroy (GTK_WIDGET (dialog)); -} - -static void -on_display_type_changed (GtkComboBox *cb, t_xkb *xkb) -{ - xkb->display_type = gtk_combo_box_get_active (cb); - xkb_refresh_gui (xkb); -} - -static void -on_display_textsize_changed (GtkComboBox *cb, t_xkb *xkb) -{ - xkb->display_textsize = gtk_combo_box_get_active (cb); - xkb_refresh_gui (xkb); -} - -static void -on_group_policy_changed (GtkComboBox *cb, t_xkb *xkb) -{ - xkb->group_policy = gtk_combo_box_get_active (cb); - xkb_config_set_group_policy (xkb->group_policy); -} - -void -xfce_xkb_configure (XfcePanelPlugin *plugin, - t_xkb *xkb) -{ - GtkWidget *display_type_optmenu, *group_policy_combo; - GtkWidget *vbox, *display_type_frame, *group_policy_frame, *bin; - GtkWidget *display_textsize_frame, *display_textsize_optmenu; - - xfce_panel_plugin_block_menu (plugin); - - settings_dialog = xfce_titled_dialog_new_with_buttons (_("Keyboard Layouts"), - NULL, GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); - gtk_window_set_icon_name (GTK_WINDOW (settings_dialog), "xfce4-settings"); - - vbox = gtk_vbox_new (FALSE, 2); - gtk_widget_show (vbox); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (settings_dialog)->vbox), vbox); - - /*****/ - display_type_frame = xfce_gtk_frame_box_new (_("Show layout as:"), &bin); - gtk_widget_show (display_type_frame); - gtk_box_pack_start (GTK_BOX (vbox), display_type_frame, TRUE, TRUE, 2); - - display_type_optmenu = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (display_type_optmenu), _("image")); - gtk_combo_box_append_text (GTK_COMBO_BOX (display_type_optmenu), _("text")); - gtk_widget_set_size_request (display_type_optmenu, 230, -1); - gtk_container_add (GTK_CONTAINER (bin), display_type_optmenu); - - /* text size option */ - display_textsize_frame = xfce_gtk_frame_box_new (_("Text size:"), &bin); - gtk_widget_show (display_textsize_frame); - gtk_box_pack_start (GTK_BOX (vbox), display_textsize_frame, TRUE, TRUE, 2); - - display_textsize_optmenu = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (display_textsize_optmenu), _("small")); - gtk_combo_box_append_text (GTK_COMBO_BOX (display_textsize_optmenu), _("medium")); - gtk_combo_box_append_text (GTK_COMBO_BOX (display_textsize_optmenu), _("large")); - gtk_widget_set_size_request (display_textsize_optmenu, 230, -1); - gtk_container_add (GTK_CONTAINER (bin), display_textsize_optmenu); - - group_policy_frame = xfce_gtk_frame_box_new (_("Manage layout:"), &bin); - gtk_widget_show (group_policy_frame); - gtk_box_pack_start (GTK_BOX (vbox), group_policy_frame, TRUE, TRUE, 2); - - group_policy_combo = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("globally")); - gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("per window")); - gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("per application")); - gtk_widget_set_size_request (group_policy_combo, 230, -1); - gtk_container_add (GTK_CONTAINER (bin), group_policy_combo); - gtk_widget_show (group_policy_combo); - - gtk_widget_show_all (vbox); - - g_signal_connect ((gpointer) settings_dialog, "response", - G_CALLBACK (on_settings_close), xkb); - - gtk_combo_box_set_active (GTK_COMBO_BOX (display_type_optmenu), xkb->display_type); - gtk_combo_box_set_active (GTK_COMBO_BOX (display_textsize_optmenu), xkb->display_textsize); - gtk_combo_box_set_active (GTK_COMBO_BOX (group_policy_combo), xkb->group_policy); - - g_signal_connect (display_type_optmenu, "changed", G_CALLBACK (on_display_type_changed), xkb); - g_signal_connect (group_policy_combo, "changed", G_CALLBACK (on_group_policy_changed), xkb); - g_signal_connect (display_textsize_optmenu, "changed", G_CALLBACK (on_display_textsize_changed), xkb); - - gtk_widget_show (settings_dialog); -} - -void -xfce_xkb_about (XfcePanelPlugin *plugin) -{ - GtkWidget *about; - const gchar* authors[] = { - "Alexander Iliev ", - "Gauvain Pocentek ", - "Igor Slepchin ", - NULL - }; - - about = gtk_about_dialog_new (); - gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (about), - _("Keyboard Layouts Plugin")); - gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about), - PACKAGE_VERSION); - gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), - NULL); - gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (about), - xfce_get_license_text (XFCE_LICENSE_TEXT_GPL)); - gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about), - (const gchar**) authors); - gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (about), - _("Allows you to configure and use multiple keyboard layouts.")); - gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about), - "http://goodies.xfce.org/"); - gtk_about_dialog_set_website_label (GTK_ABOUT_DIALOG (about), - _("Other plugins available here")); - gtk_dialog_run (GTK_DIALOG (about)); - gtk_widget_destroy (about); -} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-settings-dialog.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-settings-dialog.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-settings-dialog.h 2012-07-09 18:14:55.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-settings-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ -/* xkb-settings-dialog.h - * Copyright (C) 2008 Alexander Iliev - * - * Parts of this program comes from the XfKC tool: - * Copyright (C) 2006 Gauvain Pocentek - * - * A part of this file comes from the gnome keyboard capplet (control-center): - * Copyright (C) 2003 Sergey V. Oudaltsov - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __XKB_SETTINGS_DIALOG_H__ -#define __XKB_SETTINGS_DIALOG_H__ - -void xfce_xkb_configure (XfcePanelPlugin *plugin, - t_xkb *xkb); - -void xfce_xkb_about (XfcePanelPlugin *plugin); - -#endif - diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-util.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-util.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-util.c 2013-07-08 18:43:09.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-util.c 2017-06-22 07:53:27.000000000 +0000 @@ -24,72 +24,83 @@ */ #include -#include -#include #include "xkb-util.h" -#include "xkb-config.h" // TODO : REMOVE THIS + + gchar* xkb_util_get_flag_filename (const gchar* group_name) { - gchar* filename; + gchar* filename; - if (!group_name) - return NULL; + if (!group_name) + return NULL; - filename = g_strconcat (FLAGSDIR, "/", group_name, ".svg", NULL); + filename = g_strconcat (g_get_user_data_dir (), "/", FLAGSRELDIR, "/", group_name, ".svg", NULL); + + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) + { + g_free (filename); + filename = g_strconcat (DATADIR, "/", FLAGSRELDIR, "/", group_name, ".svg", NULL); + } - return filename; + return filename; } + + gchar* -xkb_util_get_layout_string (const gchar *group_name, const gchar *variant) +xkb_util_get_layout_string (const gchar *group_name, + const gchar *variant) { - gchar *layout; + gchar *layout; - if (!group_name) - return NULL; + if (!group_name) + return NULL; - if (variant && strlen (variant) > 0) - { - layout = g_strconcat (group_name, " (", variant, ")", NULL); - } - else - { - layout = g_strconcat (group_name, NULL); - } + if (variant && strlen (variant) > 0) + layout = g_strconcat (group_name, " (", variant, ")", NULL); + else + layout = g_strconcat (group_name, NULL); - return layout; + return layout; } + + gchar* -xkb_util_normalize_group_name (const gchar* group_name) +xkb_util_normalize_group_name (const gchar *group_name, + gboolean capitalize) { - const gchar *c; - gchar *result; - gint cut_length; - gint index_of_na = -1; + const gchar *c; + gchar *result; + gint cut_length; + gint index_of_na = -1; - if (!group_name) - return NULL; + if (!group_name) + return NULL; - if (strlen (group_name) <= 3) - return g_strdup (group_name); + cut_length = strlen (group_name); - for (c = group_name; *c; c++) + if (cut_length > 3) { - if (!((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z'))) + for (c = group_name; *c; c++) { - index_of_na = c - group_name; - break; + if (!((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z'))) + { + index_of_na = c - group_name; + break; + } } - } - cut_length = (index_of_na != -1 && index_of_na <= 3) ? index_of_na : 3; + cut_length = (index_of_na != -1 && index_of_na <= 3) ? index_of_na : 3; + } + if (capitalize) + result = g_ascii_strup (group_name, cut_length); + else result = g_strndup (group_name, cut_length); - return result; + return result; } - diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-util.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-util.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-util.h 2012-07-09 18:14:55.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-util.h 2017-06-22 07:53:27.000000000 +0000 @@ -27,14 +27,12 @@ #define __XKB_UTIL_H__ #include -#include -#include -gchar* xkb_util_get_flag_filename (const gchar* group_name); +gchar* xkb_util_get_flag_filename (const gchar *group_name); -gchar* xkb_util_get_layout_string (const gchar* group_name, - const gchar* variant); -gchar* xkb_util_normalize_group_name (const gchar* group_name); +gchar* xkb_util_get_layout_string (const gchar *group_name, + const gchar *variant); +gchar* xkb_util_normalize_group_name (const gchar *group_name, + gboolean capitalize); #endif - diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-xfconf.c xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-xfconf.c --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-xfconf.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-xfconf.c 2017-06-28 21:04:55.000000000 +0000 @@ -0,0 +1,387 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-xfconf.c + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "xkb-xfconf.h" + +#include + +#include + +#define DEFAULT_DISPLAY_TYPE DISPLAY_TYPE_IMAGE +#define DEFAULT_DISPLAY_NAME DISPLAY_NAME_COUNTRY +#define DEFAULT_DISPLAY_SCALE DISPLAY_SCALE_MAX +#define DEFAULT_CAPS_LOCK_INDICATOR TRUE +#define DEFAULT_DISPLAY_TOOLTIP_ICON TRUE +#define DEFAULT_GROUP_POLICY GROUP_POLICY_PER_APPLICATION + +static void xkb_xfconf_finalize (GObject *object); +static void xkb_xfconf_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void xkb_xfconf_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); + +struct _XkbXfconfClass +{ + GObjectClass __parent__; +}; + +struct _XkbXfconf +{ + GObject __parent__; + + XkbDisplayType display_type; + XkbDisplayName display_name; + guint display_scale; + gboolean caps_lock_indicator; + gboolean display_tooltip_icon; + XkbGroupPolicy group_policy; +}; + +enum +{ + PROP_0, + PROP_DISPLAY_TYPE, + PROP_DISPLAY_NAME, + PROP_DISPLAY_SCALE, + PROP_CAPS_LOCK_INDICATOR, + PROP_DISPLAY_TOOLTIP_ICON, + PROP_GROUP_POLICY, + N_PROPERTIES, +}; + +enum +{ + CONFIGURATION_CHANGED, + LAST_SIGNAL +}; + +static guint xkb_xfconf_signals[LAST_SIGNAL] = { 0, }; + +G_DEFINE_TYPE (XkbXfconf, xkb_xfconf, G_TYPE_OBJECT) + + + +static void +xkb_xfconf_class_init (XkbXfconfClass *klass) +{ + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = xkb_xfconf_finalize; + gobject_class->get_property = xkb_xfconf_get_property; + gobject_class->set_property = xkb_xfconf_set_property; + + g_object_class_install_property (gobject_class, PROP_DISPLAY_TYPE, + g_param_spec_uint (DISPLAY_TYPE, NULL, NULL, + DISPLAY_TYPE_IMAGE, + DISPLAY_TYPE_SYSTEM, + DEFAULT_DISPLAY_TYPE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_DISPLAY_NAME, + g_param_spec_uint (DISPLAY_NAME, NULL, NULL, + DISPLAY_NAME_COUNTRY, + DISPLAY_NAME_LANGUAGE, + DEFAULT_DISPLAY_NAME, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_DISPLAY_SCALE, + g_param_spec_uint (DISPLAY_SCALE, NULL, NULL, + DISPLAY_SCALE_MIN, + DISPLAY_SCALE_MAX, + DEFAULT_DISPLAY_SCALE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_CAPS_LOCK_INDICATOR, + g_param_spec_boolean (CAPS_LOCK_INDICATOR, NULL, NULL, + DEFAULT_CAPS_LOCK_INDICATOR, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_DISPLAY_TOOLTIP_ICON, + g_param_spec_boolean (DISPLAY_TOOLTIP_ICON, NULL, NULL, + DEFAULT_DISPLAY_TOOLTIP_ICON, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_GROUP_POLICY, + g_param_spec_uint (GROUP_POLICY, NULL, NULL, + GROUP_POLICY_GLOBAL, + GROUP_POLICY_PER_APPLICATION, + DEFAULT_GROUP_POLICY, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + xkb_xfconf_signals[CONFIGURATION_CHANGED] = + g_signal_new (g_intern_static_string ("configuration-changed"), + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); +} + + + +static void +xkb_xfconf_init (XkbXfconf *config) +{ + config->display_type = DEFAULT_DISPLAY_TYPE; + config->display_name = DEFAULT_DISPLAY_NAME; + config->display_scale = DEFAULT_DISPLAY_SCALE; + config->caps_lock_indicator = DEFAULT_CAPS_LOCK_INDICATOR; + config->display_tooltip_icon = DEFAULT_DISPLAY_TOOLTIP_ICON; + config->group_policy = DEFAULT_GROUP_POLICY; +} + + + +static void +xkb_xfconf_finalize (GObject *object) +{ + xfconf_shutdown (); + G_OBJECT_CLASS (xkb_xfconf_parent_class)->finalize (object); +} + + + +static void +xkb_xfconf_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + XkbXfconf *config = XKB_XFCONF (object); + + switch (prop_id) + { + case PROP_DISPLAY_TYPE: + g_value_set_uint (value, config->display_type); + break; + + case PROP_DISPLAY_NAME: + g_value_set_uint (value, config->display_name); + break; + + case PROP_DISPLAY_SCALE: + g_value_set_uint (value, config->display_scale); + break; + + case PROP_CAPS_LOCK_INDICATOR: + g_value_set_boolean (value, config->caps_lock_indicator); + break; + + case PROP_DISPLAY_TOOLTIP_ICON: + g_value_set_boolean (value, config->display_tooltip_icon); + break; + + case PROP_GROUP_POLICY: + g_value_set_uint (value, config->group_policy); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + + +static void +xkb_xfconf_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + XkbXfconf *config = XKB_XFCONF (object); + guint val_uint; + gboolean val_boolean; + + switch (prop_id) + { + case PROP_DISPLAY_TYPE: + val_uint = g_value_get_uint (value); + if (config->display_type != val_uint) + { + config->display_type = val_uint; + g_object_notify (G_OBJECT (config), DISPLAY_TYPE); + g_signal_emit (G_OBJECT (config), xkb_xfconf_signals[CONFIGURATION_CHANGED], 0); + } + break; + + case PROP_DISPLAY_NAME: + val_uint = g_value_get_uint (value); + if (config->display_name != val_uint) + { + config->display_name = val_uint; + g_object_notify (G_OBJECT (config), DISPLAY_NAME); + g_signal_emit (G_OBJECT (config), xkb_xfconf_signals[CONFIGURATION_CHANGED], 0); + } + break; + + case PROP_DISPLAY_SCALE: + val_uint = g_value_get_uint (value); + if (config->display_scale != val_uint) + { + config->display_scale = val_uint; + g_object_notify (G_OBJECT (config), DISPLAY_SCALE); + g_signal_emit (G_OBJECT (config), xkb_xfconf_signals[CONFIGURATION_CHANGED], 0); + } + break; + + case PROP_CAPS_LOCK_INDICATOR: + val_boolean = g_value_get_boolean (value); + if (config->caps_lock_indicator != val_boolean) + { + config->caps_lock_indicator = val_boolean; + g_object_notify (G_OBJECT (config), CAPS_LOCK_INDICATOR); + g_signal_emit (G_OBJECT (config), xkb_xfconf_signals[CONFIGURATION_CHANGED], 0); + } + break; + + case PROP_DISPLAY_TOOLTIP_ICON: + val_boolean = g_value_get_boolean (value); + if (config->display_tooltip_icon != val_boolean) + { + config->display_tooltip_icon = val_boolean; + g_object_notify (G_OBJECT (config), DISPLAY_TOOLTIP_ICON); + g_signal_emit (G_OBJECT (config), xkb_xfconf_signals[CONFIGURATION_CHANGED], 0); + } + break; + + case PROP_GROUP_POLICY: + val_uint = g_value_get_uint (value); + if (config->group_policy != val_uint) + { + config->group_policy = val_uint; + g_object_notify (G_OBJECT (config), GROUP_POLICY); + g_signal_emit (G_OBJECT (config), xkb_xfconf_signals[CONFIGURATION_CHANGED], 0); + } + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + + +XkbDisplayType +xkb_xfconf_get_display_type (XkbXfconf *config) +{ + g_return_val_if_fail (IS_XKB_XFCONF (config), DEFAULT_DISPLAY_TYPE); + return config->display_type; +} + + + +XkbDisplayName +xkb_xfconf_get_display_name (XkbXfconf *config) +{ + g_return_val_if_fail (IS_XKB_XFCONF (config), DEFAULT_DISPLAY_NAME); + return config->display_name; +} + + + +guint +xkb_xfconf_get_display_scale (XkbXfconf *config) +{ + g_return_val_if_fail (IS_XKB_XFCONF (config), DEFAULT_DISPLAY_SCALE); + return config->display_scale; +} + + + +gboolean +xkb_xfconf_get_caps_lock_indicator (XkbXfconf *config) +{ + g_return_val_if_fail (IS_XKB_XFCONF (config), DEFAULT_CAPS_LOCK_INDICATOR); + return config->caps_lock_indicator; +} + + + +gboolean +xkb_xfconf_get_display_tooltip_icon (XkbXfconf *config) +{ + g_return_val_if_fail (IS_XKB_XFCONF (config), DEFAULT_DISPLAY_TOOLTIP_ICON); + return config->display_tooltip_icon; +} + + + +XkbGroupPolicy +xkb_xfconf_get_group_policy (XkbXfconf *config) +{ + g_return_val_if_fail (IS_XKB_XFCONF (config), DEFAULT_GROUP_POLICY); + return config->group_policy; +} + + + +XkbXfconf * +xkb_xfconf_new (const gchar *property_base) +{ + XkbXfconf *config; + XfconfChannel *channel; + gchar *property; + + config = g_object_new (TYPE_XKB_XFCONF, NULL); + + if (xfconf_init (NULL)) + { + channel = xfconf_channel_get ("xfce4-panel"); + + property = g_strconcat (property_base, "/" DISPLAY_TYPE, NULL); + xfconf_g_property_bind (channel, property, G_TYPE_UINT, config, DISPLAY_TYPE); + g_free (property); + + property = g_strconcat (property_base, "/" DISPLAY_NAME, NULL); + xfconf_g_property_bind (channel, property, G_TYPE_UINT, config, DISPLAY_NAME); + g_free (property); + + property = g_strconcat (property_base, "/" DISPLAY_SCALE, NULL); + xfconf_g_property_bind (channel, property, G_TYPE_UINT, config, DISPLAY_SCALE); + g_free (property); + + property = g_strconcat (property_base, "/" CAPS_LOCK_INDICATOR, NULL); + xfconf_g_property_bind (channel, property, G_TYPE_BOOLEAN, config, CAPS_LOCK_INDICATOR); + g_free (property); + + property = g_strconcat (property_base, "/" DISPLAY_TOOLTIP_ICON, NULL); + xfconf_g_property_bind (channel, property, G_TYPE_BOOLEAN, config, DISPLAY_TOOLTIP_ICON); + g_free (property); + + property = g_strconcat (property_base, "/" GROUP_POLICY, NULL); + xfconf_g_property_bind (channel, property, G_TYPE_UINT, config, GROUP_POLICY); + g_free (property); + } + + return config; +} diff -Nru xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-xfconf.h xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-xfconf.h --- xfce4-xkb-plugin-0.7.1/panel-plugin/xkb-xfconf.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/panel-plugin/xkb-xfconf.h 2017-06-28 21:04:55.000000000 +0000 @@ -0,0 +1,54 @@ +/* vim: set backspace=2 ts=4 softtabstop=4 sw=4 cinoptions=>4 expandtab autoindent smartindent: */ +/* xkb-xfconf.h + * Copyright (C) 2008 Alexander Iliev + * + * Parts of this program comes from the XfKC tool: + * Copyright (C) 2006 Gauvain Pocentek + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _XKB_XFCONF_H_ +#define _XKB_XFCONF_H_ + +#include +#include "xkb-properties.h" + +G_BEGIN_DECLS + +typedef struct _XkbXfconfClass XkbXfconfClass; +typedef struct _XkbXfconf XkbXfconf; + +#define TYPE_XKB_XFCONF (xkb_xfconf_get_type ()) +#define XKB_XFCONF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_XKB_XFCONF, XkbXfconf)) +#define XKB_XFCONF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_XKB_XFCONF, XkbXfconfClass)) +#define IS_XKB_XFCONF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_XKB_XFCONF)) +#define IS_XKB_XFCONF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_XKB_XFCONF)) +#define XKB_XFCONF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_XKB_XFCONF, XkbXfconfClass)) + +GType xkb_xfconf_get_type (void) G_GNUC_CONST; + +XkbXfconf *xkb_xfconf_new (const gchar *property_base); + +XkbDisplayType xkb_xfconf_get_display_type (XkbXfconf *config); +XkbDisplayName xkb_xfconf_get_display_name (XkbXfconf *config); +guint xkb_xfconf_get_display_scale (XkbXfconf *config); +gboolean xkb_xfconf_get_caps_lock_indicator (XkbXfconf *config); +gboolean xkb_xfconf_get_display_tooltip_icon (XkbXfconf *config); +XkbGroupPolicy xkb_xfconf_get_group_policy (XkbXfconf *config); + +G_END_DECLS + +#endif diff -Nru xfce4-xkb-plugin-0.7.1/po/ar.po xfce4-xkb-plugin-0.8.1/po/ar.po --- xfce4-xkb-plugin-0.7.1/po/ar.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ar.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,89 +3,102 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# ahmadzxc , 2013 +# ahmad , 2013 # محمد الحرقان , 2012 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-29 13:01+0000\n" -"Last-Translator: ahmadzxc \n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/xfce/language/ar/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Arabic (http://www.transifex.com/xfce/xfce-panel-plugins/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "تخطيطات لوحة المفاتيح" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "المظهر" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "أظهر التخطيط كـ:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "صورة" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "نص" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "حجم النص:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "صغير" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "متوسط" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "كبير" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "إدارة التخطيطات:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "للكل" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "حسب النوافذ" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "حسب التطبيق" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "إضافة تخطيطات لوحة المفاتيح" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "تسمح لك بضبط و إستعمال عدة تخطيطات لوحة المفاتيح." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "إضافات أخرى متوفرة هنا" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "اعدادات لوحة المفاتيح" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "إعدادات تخطيطات لوحة المفاتيح ومفاتيح التبديل" diff -Nru xfce4-xkb-plugin-0.7.1/po/ast.po xfce4-xkb-plugin-0.8.1/po/ast.po --- xfce4-xkb-plugin-0.7.1/po/ast.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ast.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,88 +3,101 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Tornes Llume , 2014 +# Ḷḷumex03 , 2014 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-04-14 15:35+0000\n" -"Last-Translator: Tornes Llume \n" -"Language-Team: Asturian (http://www.transifex.com/projects/p/xfce/language/ast/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Asturian (http://www.transifex.com/xfce/xfce-panel-plugins/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ast\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Distribuciones de tecláu" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Aspeutu" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Amosar distribución como:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "imaxen" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "testu" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tamañu del testu:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "pequeñu" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "mediu" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "grande" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Alministrar distribución:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globalmente" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "per ventana" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "per aplicación" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Complementu de distribuciones de tecláu" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Permítete configurar y usar distribuciones de tecláu múltiples." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Otros complementos disponibles equí" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Axustes del tecláu" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Complementu de configuración y escoyeta de distribuciones de tecláu" diff -Nru xfce4-xkb-plugin-0.7.1/po/be.po xfce4-xkb-plugin-0.8.1/po/be.po --- xfce4-xkb-plugin-0.7.1/po/be.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/be.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,124 +1,103 @@ -# Belarusian translation. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Alexander Nyakhaychyk , 2008. -# +# +# Translators: +# Alexander Nyakhaychyk , 2008 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin trunk\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2008-11-09 13:58+0200\n" -"Last-Translator: Alexander Nyakhaychyk \n" -"Language-Team: Belarusian \n" -"Language: be\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Belarusian (http://www.transifex.com/xfce/xfce-panel-plugins/language/be/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: be\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Раскладкі клявіятуры" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Выгляд" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Інфармаваць пра раскладку ў выглядзе:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "відарыса" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "тэксту" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Памер тэксту" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "маленькі" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "сярэдні" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "вялікі" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Дзеяньне раскладкі:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "глябальнае" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "для кожнага вакна" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "для кожнага дастасаваньня" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Модуль раскладак клявіятуры" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Дазваляе вам наладжіць і выкарыстоўваць некалькі раскладак клявіятуры." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Іншыя наяўныя ўтулкі" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Раскладкі клявіятуры" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Модуль наладкі й пераключэньня раскладак клявіятуры" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "Мадыфікатары канфігурацыі XKB адключаныя\n" -#~ "ў файле наладак.\n" -#~ "\n" -#~ "Па даведку зьвяртайцеся ў файл README." - -#~ msgid "Keyboard model:" -#~ msgstr "Мадэль клявіятуры:" - -#~ msgid "Change layout option:" -#~ msgstr "Опцыі раскладкі:" - -#~ msgid "Compose key position:" -#~ msgstr "Прызначыць клавішу Compose:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Раскладкі клявіятуры:" - -#~ msgid "Default" -#~ msgstr "Па-змоўчванню" - -#~ msgid "Layout" -#~ msgstr "Разкладка" - -#~ msgid "Variant" -#~ msgstr "Варыянт" - -#~ msgid "Add layout" -#~ msgstr "Дадаць раскладку" diff -Nru xfce4-xkb-plugin-0.7.1/po/bg.po xfce4-xkb-plugin-0.8.1/po/bg.po --- xfce4-xkb-plugin-0.7.1/po/bg.po 2015-02-27 22:00:46.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/bg.po 2017-08-11 14:36:31.000000000 +0000 @@ -4,89 +4,106 @@ # # Translators: # Alexander Iliev , 2008 -# Kiril Kirilov , 2015 -# Lyubomir Vasilev, 2015 +# Kiril Kirilov , 2015,2017 +# Любомир Василев, 2015 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2015-02-23 16:16+0000\n" -"Last-Translator: Lyubomir Vasilev\n" -"Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce-panel-plugins/language/bg/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-27 06:18+0000\n" +"Last-Translator: Kiril Kirilov \n" +"Language-Team: Bulgarian (http://www.transifex.com/xfce/xfce-panel-plugins/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Тази опция не е налична за текущия стил на клавиатурната подредба" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Клавиатурни подредби" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Външен вид" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Показване на подредбата като:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "картинка" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "текст" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Размер на текста:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "малък" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "среден" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "голям" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "система" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Име на подредбата:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "страна" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "език" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Размер на джаджа:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Caps Lock индикатор:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Икона на подсказката:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Поведение" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Управлявай подредбата:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "глобално" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "за всеки прозорец" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "за всяко приложение" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Клавиатурна подредба" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Позволява да конфигурирате и използвате повече от една клавиатурна подредба." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Тук ще намерите други добавки" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Настройка на клавиатурата" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Добавка за настройка и превключване на клавиатурните подредби" diff -Nru xfce4-xkb-plugin-0.7.1/po/ca.po xfce4-xkb-plugin-0.8.1/po/ca.po --- xfce4-xkb-plugin-0.7.1/po/ca.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ca.po 2017-08-11 14:36:31.000000000 +0000 @@ -1,148 +1,111 @@ -# Catalan translation of xfce4-xkb-plugin. -# Copyright (C) 2004-2007 Alexander Iliev. -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# Pau Ruŀlan Ferragut , 2006. -# Carles Muñoz Gorriz , 2007-2009, 2012. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Carles Muñoz Gorriz , 2012 +# Davidmp , 2016 +# Pau Ruŀlan Ferragut , 2006 +# Robert Antoni Buj Gelonch , 2017 +# Robert Antoni Buj Gelonch , 2016 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin 0.4.1\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2012-01-15 19:52+0100\n" -"Last-Translator: Carles Muñoz Gorriz \n" -"Language-Team: Catalan\n" -"Language: \n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-27 08:21+0000\n" +"Last-Translator: Robert Antoni Buj Gelonch \n" +"Language-Team: Catalan (http://www.transifex.com/xfce/xfce-panel-plugins/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Catalan\n" -"X-Poedit-SourceCharset: utf-8\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Aquesta opció no està disponible per a l'estil de disposició actual" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" -msgstr "Tipus de teclat" +msgstr "Disposicions de teclats" + +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Aparença" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" -msgstr "Mostra el tipus com:" +msgstr "Mostra la disposició com:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "imatge" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "text" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Mida del text:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "petit" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "mitjà" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "gran" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sistema" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Nom de la disposició:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "país" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "idioma" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Mida de l'estri:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Indicador de Bloq Maj:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Icona de l'indicador de funció:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Comportament" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Gestiona el tipus:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globalment" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "per finestra" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "per aplicació" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" -msgstr "Connector de tipus de teclat" +msgstr "Connector de les disposicions del teclat" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." -msgstr "Us permet configurar i emprar diversos tipus de teclat." +msgstr "Us permet configurar i utilitzar múltiples disposicions de teclats." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Altres connectors disponibles" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" -msgstr "Tipus de teclat" +msgstr "Ajusts del teclat" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" -msgstr "Connector de configuració i canvi del tipus teclat" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "Les modificacions de la configuració de XKB\n" -#~ "s'han deshabilitat en el fitxer de configuració.\n" -#~ "\n" -#~ "Mireu el fitxer README per més informació." - -#~ msgid "Keyboard model:" -#~ msgstr "Model de teclat:" - -#~ msgid "Change layout option:" -#~ msgstr "Canvia les opcions del tipus:" - -#~ msgid "Compose key position:" -#~ msgstr "Posició de la tecla «Compose»:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Tipus de teclat:" - -#~ msgid "Default" -#~ msgstr "Per defecte" - -#~ msgid "Layout" -#~ msgstr "Tipus" - -#~ msgid "Variant" -#~ msgstr "Variant" - -#~ msgid "Add layout" -#~ msgstr "Afegeix tipus" - -#~ msgid "" -#~ "Allows you to switch the keyboard layout and\n" -#~ "displays the currently selected layout." -#~ msgstr "" -#~ "Permet commutar la distribució del teclat i\n" -#~ "mostra la distribució actual." - -#~ msgid "Configure Keyboard Layout Switcher" -#~ msgstr "Commuta la configuració de la distribució del teclat" - -#~ msgid "_Remember layout for each application" -#~ msgstr "_Recorda la distribució segons l’aplicacions" - -#~ msgid "Button to switch the X keyboard layout" -#~ msgstr "Botó per canviar el format de teclat de les X" - -#~ msgid "" -#~ "Displays the current keyboard layout and switches the layout when clicked" -#~ msgstr "Mostra la distribució del teclat i la commuta en fer clic" +msgstr "Connector de configuració i de canvi de la disposició del teclat" diff -Nru xfce4-xkb-plugin-0.7.1/po/cs.po xfce4-xkb-plugin-0.8.1/po/cs.po --- xfce4-xkb-plugin-0.7.1/po/cs.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/cs.po 2017-08-11 14:36:31.000000000 +0000 @@ -4,87 +4,105 @@ # # Translators: # Alois Nešpor , 2013 +# Michal Várady , 2015,2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-08-12 08:25+0000\n" -"Last-Translator: Alois Nešpor \n" -"Language-Team: Czech (http://www.transifex.com/projects/p/xfce/language/cs/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-27 07:45+0000\n" +"Last-Translator: Michal Várady \n" +"Language-Team: Czech (http://www.transifex.com/xfce/xfce-panel-plugins/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Tato volba není dostupná pro aktuální styl rozložení " + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Rozložení klávesnice" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Vzhled" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Zobrazit rozložení jako:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "obrázek" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "text" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Velikost textu:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "malý" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "střední" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "velký" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "systém" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Název rozložení:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "země" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "jazyk" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Velikost nástroje:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Indikátor Caps Lock:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Ikona tipu:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Chování" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Spravovat rozložení:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globálně" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "pro jednotlivá okna" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "pro jednotlivé aplikace" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Přepínač rozložení klávesnice" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Umožňuje konfigurovat a používat více rozložení klávesnic." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Další zásuvné moduly jsou dostupné zde" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Nastavení klávesnice" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Nastavuje a přepíná rozložení klávesnice" diff -Nru xfce4-xkb-plugin-0.7.1/po/da.po xfce4-xkb-plugin-0.8.1/po/da.po --- xfce4-xkb-plugin-0.7.1/po/da.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/da.po 2017-08-11 14:36:31.000000000 +0000 @@ -3,90 +3,109 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# cedeel , 2013 +# Chris Darnell , 2013 # Jannich Brendle , 2008 +# Morten Juhl-Johansen Zölde-Fejér , 2016 # Per Kongstad , 2008 +# scootergrisen, 2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-11-20 18:00+0000\n" -"Last-Translator: cedeel \n" -"Language-Team: Danish (http://www.transifex.com/projects/p/xfce/language/da/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-28 01:43+0000\n" +"Last-Translator: scootergrisen\n" +"Language-Team: Danish (http://www.transifex.com/xfce/xfce-panel-plugins/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Denne valgmulighed er ikke tilgængelig for den nuværende layoutstil" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Tastaturlayouts" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Udseende" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Vis layout som:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "billede" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "tekst" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tekst størrelse:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "lille" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "mellem" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "stor" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "system" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Layoutnavn:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "land" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "sprog" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Widget-størrelse:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Caps Lock-indikator:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Ikon for værktøjstip:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Adfærd" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Håndtér layout:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globalt" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "hvert vindue" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "hvert program" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Udvidelsesmodul til tastaturlayouts" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Tillader dig at indstille og bruge flere tastaturlayouts." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Andre plugins er tilgængelige her" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Tastaturindstillinger" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Udvidelsesmodul til indstilling og skift af tastaturlayout" diff -Nru xfce4-xkb-plugin-0.7.1/po/de.po xfce4-xkb-plugin-0.8.1/po/de.po --- xfce4-xkb-plugin-0.7.1/po/de.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/de.po 2017-08-11 14:36:31.000000000 +0000 @@ -5,88 +5,106 @@ # Translators: # Fabian Nowak , 2007-2008 # Frank Lanitz , 2006 -# to_ba, 2014 +# Tobias Bannert , 2014-2015,2017 +# Vinzenz Vietzke , 2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-01-25 16:21+0000\n" -"Last-Translator: to_ba\n" -"Language-Team: German (http://www.transifex.com/projects/p/xfce/language/de/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-08-10 22:46+0000\n" +"Last-Translator: Vinzenz Vietzke \n" +"Language-Team: German (http://www.transifex.com/xfce/xfce-panel-plugins/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Diese Option ist für den aktuellen Layoutstil nicht verfügbar" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Tastaturbelegung" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Erscheinungsbild" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Belegung anzeigen als:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "Bild" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "Text" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Textgröße:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "klein" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "mittel" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "groß" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "System" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Belegungsname:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "Land" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "Sprache" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Widget-Größe:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Feststelltastenanzeige:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Kurzhilfensymbol:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Verhalten" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Belegung verwalten:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "global" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "pro Fenster" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "pro Anwendung" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Tastaturbelegungserweiterung" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Ermöglicht das Einstellen und Verwenden verschiedener Tastaturbelegungen." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Weitere Erweiterungen sind hier verfügbar" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Tastatureinstellungen" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Erweiterung zum Einstellen und Umschalten der Tastaturbelegung" diff -Nru xfce4-xkb-plugin-0.7.1/po/el.po xfce4-xkb-plugin-0.8.1/po/el.po --- xfce4-xkb-plugin-0.7.1/po/el.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/el.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,147 +1,106 @@ -# Greek translations for xfce4-xkb-plugin package. -# Copyright (C) 2004-2006 Alexander Iliev. -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# Stavros Giannouris , 2006. -# Efstathios Iosifidis , 2012. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Efstathios Iosifidis , 2015 +# Efstathios Iosifidis , 2012 +# Ioannis LM, 2015 +# Stavros Giannouris , 2006 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin 0.4.1\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2012-05-20 04:18+0300\n" -"Last-Translator: Efstathios Iosifidis \n" -"Language-Team: Ελληνικά, Σύγχρονα \n" -"Language: el\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Greek (http://www.transifex.com/xfce/xfce-panel-plugins/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: el\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Διατάξεις πληκτρολογίου" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Εμφάνιση" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Εμφάνιση διάταξης ως" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "εικόνα" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "κείμενο" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Μέγεθος κειμένου:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "μικρό" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "μεσαίο" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "μεγάλο" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Διαχείριση διάταξης:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "καθολικά" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "ανά παράθυρο" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "ανά εφαρμογή" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Άρθρωμα διάταξης πληκτρολογίου" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." -msgstr "" -"Σας επιτρέπει να ρυθμίσετε και να χρησιμοποιήσετε πολλαπλές διατάξεις του " -"πληκτρολογίου" - -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Άλλα διαθέσιμα πρόσθετα" +msgstr "Σας επιτρέπει να ρυθμίσετε και να χρησιμοποιήσετε πολλαπλές διατάξεις του πληκτρολογίου" -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Διατάξεις πληκτρολογίου" +msgstr "Ρυθμίσεις πληκτρολογίου" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Άρθρωμα εναλλαγής και ρύθμισης των διατάξεων πληκτρολογίου" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "Οι τροποποιήσεις των ρυθμίσεων του xkb είναι\n" -#~ "απενεργοποιημένες από το αρχείο ρυθμίσεων.\n" -#~ "\n" -#~ "Δείτε το αρχείο README για περισσότερες πληροφορίες." - -#~ msgid "Keyboard model:" -#~ msgstr "Μοντέλο πληκτρολογίου:" - -#~ msgid "Change layout option:" -#~ msgstr "Συνδυασμός αλλαγής διάταξης:" - -#~ msgid "Compose key position:" -#~ msgstr "Πλήκτρο σύνθεσης:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Διατάξεις πληκτρολογίου:" - -#~ msgid "Default" -#~ msgstr "Προεπιλογή" - -#~ msgid "Layout" -#~ msgstr "Διάταξη" - -#~ msgid "Variant" -#~ msgstr "Παραλλαγή" - -#~ msgid "Add layout" -#~ msgstr "Προσθήκη διάταξης" - -#~ msgid "" -#~ "Allows you to switch the keyboard layout and\n" -#~ "displays the currently selected layout." -#~ msgstr "" -#~ "Επιτρέπει την εναλλαγή της διάταξης πληκτρολογίου\n" -#~ "και εμφανίζει την τρέχουσα διάταξη." - -#~ msgid "Configure Keyboard Layout Switcher" -#~ msgstr "Ρύθμιση εναλλάκτη διάταξης πληκτρολογίου" - -#~ msgid "_Remember layout for each application" -#~ msgstr "_Καταγραφή διάταξης ανά εφαρμογή" - -#~ msgid "" -#~ "Displays the current keyboard layout and switches the layout when clicked" -#~ msgstr "" -#~ "Εμφανίζει την τρέχουσα διάταξη πληκτρολογίου και την αλλάζει όταν κάνετε " -#~ "κλικ επάνω" diff -Nru xfce4-xkb-plugin-0.7.1/po/en_AU.po xfce4-xkb-plugin-0.8.1/po/en_AU.po --- xfce4-xkb-plugin-0.7.1/po/en_AU.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/en_AU.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,88 +3,101 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# k3lt01 , 2013 +# Michael Findlay , 2013,2015 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-29 09:48+0000\n" -"Last-Translator: k3lt01 \n" -"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfce/language/en_AU/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: English (Australia) (http://www.transifex.com/xfce/xfce-panel-plugins/language/en_AU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: en_AU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Keyboard Layouts" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Appearance" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Show layout as:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "image" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "text" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Text size:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "small" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "medium" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "large" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Manage layout:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globally" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "per window" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "per application" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Keyboard Layouts Plugin" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Allows you to configure and use multiple keyboard layouts." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Other plugins available here" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Keyboard settings" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Keyboard layouts setup and switch plugin" diff -Nru xfce4-xkb-plugin-0.7.1/po/en_GB.po xfce4-xkb-plugin-0.8.1/po/en_GB.po --- xfce4-xkb-plugin-0.7.1/po/en_GB.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/en_GB.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,142 +1,103 @@ -# English/GB translation of xfce4-xkb-plugin. -# Copyright (C) 2007 THE xfce4-xkb-plugin'S COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# Jeff Bailes , 2007. -# -# -#, fuzzy +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jeff Bailes , 2007 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2009-08-30 17:14+1000\n" -"Last-Translator: Jeff Bailes \n" -"Language-Team: English/GB\n" -"Language: \n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/xfce/xfce-panel-plugins/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Keyboard Layouts" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Appearance" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Show layout as:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "image" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "text" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Text size:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "small" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "medium" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "large" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Manage layout:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globally" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "per window" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "per application" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Keyboard Layouts Plugin" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Allows you to configure and use multiple keyboard layouts." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Other plugins available here" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Keyboard Layouts" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Keyboard layouts setup and switch plugin" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." - -#~ msgid "Keyboard model:" -#~ msgstr "Keyboard model:" - -#~ msgid "Change layout option:" -#~ msgstr "Change layout option:" - -#~ msgid "Compose key position:" -#~ msgstr "Compose key position:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Keyboard layouts:" - -#~ msgid "Default" -#~ msgstr "Default" - -#~ msgid "Layout" -#~ msgstr "Layout" - -#~ msgid "Variant" -#~ msgstr "Variant" - -#~ msgid "Add layout" -#~ msgstr "Add layout" - -#~ msgid "" -#~ "Allows you to switch the keyboard layout and\n" -#~ "displays the currently selected layout." -#~ msgstr "" -#~ "Allows you to switch the keyboard layout and\n" -#~ "displays the currently selected layout." - -#~ msgid "Configure Keyboard Layout Switcher" -#~ msgstr "Configure Keyboard Layout Switcher" - -#~ msgid "_Remember layout for each application" -#~ msgstr "_Remember layout for each application" - -#~ msgid "Button to switch the X keyboard layout" -#~ msgstr "Button to switch the X keyboard layout" diff -Nru xfce4-xkb-plugin-0.7.1/po/es.po xfce4-xkb-plugin-0.8.1/po/es.po --- xfce4-xkb-plugin-0.7.1/po/es.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/es.po 2017-09-08 20:33:34.000000000 +0000 @@ -4,90 +4,110 @@ # # Translators: # , 2009 -# Adolfo Jayme Barrientos , 2014 +# Adolfo Jayme Barrientos, 2014 +# Adolfo Jayme Barrientos, 2014 # David Segura Monroy , 2013 -# Pablo Roberto Francisco Lezaeta Reyes , 2014 +# Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] , 2017 +# Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] , 2014 +# Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] , 2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-08-02 02:16+0000\n" -"Last-Translator: Pablo Roberto Francisco Lezaeta Reyes \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/xfce-panel-plugins/language/es/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-08-15 23:06+0000\n" +"Last-Translator: Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] \n" +"Language-Team: Spanish (http://www.transifex.com/xfce/xfce-panel-plugins/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Esta opción no está disponible para la distribución actual" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Distribuciones de teclado" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Apariencia" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Mostrar distribución como:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "imagen" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "texto" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tamaño del texto:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "pequeño" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "medio" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "grande" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sistema" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Nombre de distribución:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "país" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "idioma" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Tamaño del «widget»:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Indicador de Bloq Mayús:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Icono de información sobre herramientas:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Comportamiento" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" -msgstr "Gesionar distribución:" +msgstr "Gestionar distribución:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globalmente" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "por ventana" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "por aplicación" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Complemento de distribuciones de teclado" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Le permite configurar y usar múltiples distribuciones de teclado." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Otros complementos disponibles aquí" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Configuración del teclado" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Complemento de configuración y selección de distribuciones de teclado" diff -Nru xfce4-xkb-plugin-0.7.1/po/eu.po xfce4-xkb-plugin-0.8.1/po/eu.po --- xfce4-xkb-plugin-0.7.1/po/eu.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/eu.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,127 +1,103 @@ -# translation of xfce4-xkb-plugin.master.po to Euskara -# Basque translations for xfce4-xkb-plugin package. -# Copyright (C) 2004-2006 Alexander Iliev. -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# -# Piarres Beobide ,2006, 2007, 2008, 2009. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Piarres Beobide , 2007-2009 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin.master\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2009-08-18 09:30+0200\n" -"Last-Translator: Piarres Beobide \n" -"Language-Team: Euskara \n" -"Language: \n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Basque (http://www.transifex.com/xfce/xfce-panel-plugins/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Teklatu inguruneak" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Itxura" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Ikusi ingurunea horrela:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "irudia" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "testua" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Testu tamaina:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "txikia" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "ertaina" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "handia" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Kudeatu ingurunea:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "orokorrean" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "leiho bakoitzeko" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "Aplikazio bakoizeko" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Teklatu ingurune plugina" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Teklatu ingurune ezberdinak konfiguratzeko aukera ematen du." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Hemen eskurgarri dauden beste zenbait plugin:" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Teklatu inguruneak" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Teklatu ingurune konfigurazio eta txandakatze plugina" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "XKB konfigurazio aldaketak konfigurazio\n" -#~ "fitxategitik desgaiturik daude.\n" -#~ "\n" -#~ "Ikusi README fitxategia argibide gehiagotako." - -#~ msgid "Keyboard model:" -#~ msgstr "Teklatu modeloa:" - -#~ msgid "Change layout option:" -#~ msgstr "Aldatu ingurune aukera:" - -#~ msgid "Compose key position:" -#~ msgstr "Konposizio tekla kokalekua:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Teklatu inguruneak:" - -#~ msgid "Default" -#~ msgstr "Lehenetsia" - -#~ msgid "Layout" -#~ msgstr "Ingurunea" - -#~ msgid "Variant" -#~ msgstr "Aldagaia" - -#~ msgid "Add layout" -#~ msgstr "Gehitu ingurunea" diff -Nru xfce4-xkb-plugin-0.7.1/po/fi.po xfce4-xkb-plugin-0.8.1/po/fi.po --- xfce4-xkb-plugin-0.7.1/po/fi.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/fi.po 2017-08-11 14:36:31.000000000 +0000 @@ -8,83 +8,96 @@ msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-11-20 16:32+0000\n" -"Last-Translator: Juhani Numminen \n" -"Language-Team: Finnish (http://www.transifex.com/projects/p/xfce/language/fi/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-26 18:53+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Finnish (http://www.transifex.com/xfce/xfce-panel-plugins/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Näppäinasettelut" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Ulkoasu" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Näytä asettelut:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "kuvina" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "tekstinä" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tekstin koko:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "pieni" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "keskikokoinen" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "suuri" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "Toiminta" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Hallitse asettelua:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "yleisesti" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "ikkunakohtaisesti" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "sovelluskohtaisesti" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Näppäinasetteluliitännäinen" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Hallinnoi ja käytä useita näppäinasetteluita." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Muut tässä käytettävissä olevat liitännäiset" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Näppäimistön asetukset" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Näppäinasetteluiden asetus- ja vaihtoliitännäinen" diff -Nru xfce4-xkb-plugin-0.7.1/po/fr.po xfce4-xkb-plugin-0.8.1/po/fr.po --- xfce4-xkb-plugin-0.7.1/po/fr.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/fr.po 2017-08-11 14:36:31.000000000 +0000 @@ -4,88 +4,106 @@ # # Translators: # jc1 , 2013 -# Yannick Le Guen , 2014 +# Louis Moureaux , 2015 +# Yannick Le Guen , 2014,2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-07-27 12:43+0000\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-27 14:08+0000\n" "Last-Translator: Yannick Le Guen \n" -"Language-Team: French (http://www.transifex.com/projects/p/xfce-panel-plugins/language/fr/)\n" +"Language-Team: French (http://www.transifex.com/xfce/xfce-panel-plugins/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Cette option n’est pas disponible pour le style de disposition actuel" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Dispositions du clavier" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Apparence" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Afficher la disposition sous forme de :" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "image" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "texte" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Taille du texte :" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "petit" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "moyen" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "grand" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "système" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Nom de la disposition :" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "pays" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "langue" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Taille du widget :" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Indicateur Verr Maj :" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Icône de l’infobulle :" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Comportement" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Gérer la disposition :" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globalement" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "par fenêtre" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "par application" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Greffon de disposition du clavier" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Permet l'utilisation de plusieurs dispositions du clavier." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Autres greffons disponibles ici" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Paramètres du clavier" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Greffon de disposition et de bascule du clavier" diff -Nru xfce4-xkb-plugin-0.7.1/po/gl.po xfce4-xkb-plugin-0.8.1/po/gl.po --- xfce4-xkb-plugin-0.7.1/po/gl.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/gl.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,123 +1,103 @@ -# Galician translation of xfce4-xkb-plugin -# Copyright (C) 2008-2009 Leandro Regueiro -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# -# Leandro Regueiro , 2006, 2008, 2009. -# -# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas -# colaborar connosco, podes atopar máis información en -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Leandro Regueiro , 2006,2008-2009 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2010-01-08 13:07+0100\n" -"Last-Translator: Leandro Regueiro \n" -"Language-Team: Galician \n" -"Language: gl\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Galician (http://www.transifex.com/xfce/xfce-panel-plugins/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Disposicións de teclado" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Aparencia" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Mostrar a disposición como:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "imaxe" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "texto" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tamaño do texto:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "pequeno" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "mediano" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "grande" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Xestionar a disposición:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globalmente" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "por xanela" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "por aplicativo" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Engadido de disposicións de teclado" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Permítelle configurar e usar múltiples disposicións de teclado." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Outros engadidos dispoñibles aquí" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Disposicións de teclado" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Engadido de configuración e cambio de disposicións de teclado" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "As modificacións da configuración de XKB\n" -#~ "están desactivadas no ficheiro de configuración.\n" -#~ "\n" -#~ "Consulte o ficheiro README para obter máis información." - -#~ msgid "Keyboard model:" -#~ msgstr "Modelo de teclado:" - -#~ msgid "Change layout option:" -#~ msgstr "Cambiar a opción de disposición:" - -#~ msgid "Compose key position:" -#~ msgstr "Posición da tecla de composición:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Disposicións de teclado:" - -#~ msgid "Layout" -#~ msgstr "Disposición" - -#~ msgid "Add layout" -#~ msgstr "Engadir disposición" diff -Nru xfce4-xkb-plugin-0.7.1/po/he.po xfce4-xkb-plugin-0.8.1/po/he.po --- xfce4-xkb-plugin-0.7.1/po/he.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/he.po 2017-08-11 14:36:31.000000000 +0000 @@ -3,88 +3,107 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Elishai Eliyahu , 2017 +# GenghisKhan , 2015 # Yaron Shahrabani , 2013 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-08-07 11:31+0000\n" -"Last-Translator: Yaron Shahrabani \n" -"Language-Team: Hebrew (http://www.transifex.com/projects/p/xfce/language/he/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-28 11:59+0000\n" +"Last-Translator: Elishai Eliyahu \n" +"Language-Team: Hebrew (http://www.transifex.com/xfce/xfce-panel-plugins/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "אפשרות זו אינה זמינה עבור עיצוב סידור נוכחי" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "פריסות מקלדת" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "הופעה" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" -msgstr "הצגת הפריסה בתור:" +msgstr "הצג פריסה בתור:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "תמונה" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "טקסט" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "גודל הטקסט:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "קטן" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "בינוני" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "גדול" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "מערכת" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "שם סידור:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "מדינה" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "שפה" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "גודל ישומון:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "אינדיקטור נעילה לאותיות גדולות:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "איקון טיפ עזר:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "התנהגות" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" -msgstr "ניהול הפריסה:" +msgstr "נהל פריסה:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "כללי" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "לפי חלון" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "לפי יישום" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "תוסף פריסות מקלדת" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "מאפשר לך להגדיר ולהשתמש במספר פריסות מקלדת." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "תוספים אחרים זמינים להלן" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "הגדרות מקלדת" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "תוסף הגדרה והחלפה של פריסות מקלדת" diff -Nru xfce4-xkb-plugin-0.7.1/po/hr.po xfce4-xkb-plugin-0.8.1/po/hr.po --- xfce4-xkb-plugin-0.7.1/po/hr.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/hr.po 2017-08-11 14:36:31.000000000 +0000 @@ -3,89 +3,107 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Edin Veskovic , 2015,2017 # Ivica Kolić , 2013 # Ivica Kolić , 2011 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-09-23 09:38+0000\n" -"Last-Translator: Ivica Kolić \n" -"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce/language/hr/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-27 06:14+0000\n" +"Last-Translator: Edin Veskovic \n" +"Language-Team: Croatian (http://www.transifex.com/xfce/xfce-panel-plugins/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hr\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Ova opcija nije dostupna za trenutni raspored." + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Rasporedi tipkovnice" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Izgled" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Pokaži raspored kao:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "sliku" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "tekst" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Veličina teksta:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "mala" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "srednja" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "velika" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sustav" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Izgled rasporeda" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "zemlja" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "jezik" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Veličina dodatka" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Indikator tiskanih slova:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Ikona oblačića:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Ponašanje" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Upravljajte raporedom:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globalno" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "za svaki prozor" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "za svaki program" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Priključak rasporeda tipkovnice" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Dozvoljava vam da konfigurirate i koristite više rasporeda tipkovnice." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Ostali priključci dostupni ovdje" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Postavke tipkovnice" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Priključak postavljanja i prebacivanja rasporeda tipkovnice" diff -Nru xfce4-xkb-plugin-0.7.1/po/hu.po xfce4-xkb-plugin-0.8.1/po/hu.po --- xfce4-xkb-plugin-0.7.1/po/hu.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/hu.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,89 +3,103 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Nucleo , 2013 +# Benedek Imre , 2013 # Gabor Kelemen , 2009 +# gyeben , 2016 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-09-15 00:02+0000\n" -"Last-Translator: Nucleo \n" -"Language-Team: Hungarian (http://www.transifex.com/projects/p/xfce/language/hu/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Hungarian (http://www.transifex.com/xfce/xfce-panel-plugins/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Billentyűzetkiosztások" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Megjelenés" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Kiosztás megjelenítése mint:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "Kép" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "Szöveg" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Szövegméret:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "kicsi" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "közepes" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "nagy" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Kiosztás kezelése:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "Globálisan" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "Ablakonként" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "Alkalmazásonként" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Billentyűzetkiosztás-bővítmény" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Lehetővé teszi több billentyűzetkiosztás beállítását és használatát." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "További elérhető bővítmények" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Billentyűzet beállítások" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Billentyűzetkiosztás-beállító és -váltó bővítmény" diff -Nru xfce4-xkb-plugin-0.7.1/po/id.po xfce4-xkb-plugin-0.8.1/po/id.po --- xfce4-xkb-plugin-0.7.1/po/id.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/id.po 2017-08-11 14:36:31.000000000 +0000 @@ -9,83 +9,100 @@ msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-06 09:24+0000\n" -"Last-Translator: Ardjuna \n" -"Language-Team: Indonesian (http://www.transifex.com/projects/p/xfce/language/id/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-27 07:53+0000\n" +"Last-Translator: Kukuh Syafaat \n" +"Language-Team: Indonesian (http://www.transifex.com/xfce/xfce-panel-plugins/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Opsi ini tidak tersedia untuk gaya tata letak saat ini" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Tata Letak Papan Ketik" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Penampilan" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Tampilkan tata letak sebagai:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "gambar" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "teks" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Ukuran teks:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "kecil" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "sedang" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "besar" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sistem" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Nama tata letak:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "negara" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "bahasa" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Ukuran widget:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Indikator Caps Lock:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Ikon tooltip:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Perilaku" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Atur tata letak:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "secara global" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "per jendela" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "per aplikasi" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Plugin Tata Letak Papan Ketik" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Memungkinkan anda untuk menyesuaikan berbagai tata letak papan ketik." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Plugin lainnya tersedia di sini" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Pengaturan papan ketik" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Pengaturan tata letak papan ketik dan pengalih plugin" diff -Nru xfce4-xkb-plugin-0.7.1/po/is.po xfce4-xkb-plugin-0.8.1/po/is.po --- xfce4-xkb-plugin-0.7.1/po/is.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/is.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,88 +3,102 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Sveinn í Felli , 2014-2015 # Sveinn í Felli , 2013 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-12-14 06:08+0000\n" -"Last-Translator: Sveinn í Felli \n" -"Language-Team: Icelandic (http://www.transifex.com/projects/p/xfce/language/is/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Icelandic (http://www.transifex.com/xfce/xfce-panel-plugins/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: is\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Lyklaborðsframsetningar" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Útlit" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Sýna lyklaborðsuppsetningu sem:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "mynd" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "texti" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Textastærð:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "lítill" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "miðlungs" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "stór" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Stýra framsetningu:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "allstaðar" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "fyrir glugga" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "fyrir forrit" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Lyklaborðsframsetningarviðbót" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Gerir þér kleift að stilla og nota margskonar lyklaborðsuppsetningar." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Aðrar viðbætur fást hér" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Stillingar lyklaborðs" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Viðbót fyrir framsetningar og skiptingar milli lyklaborða" diff -Nru xfce4-xkb-plugin-0.7.1/po/it.po xfce4-xkb-plugin-0.8.1/po/it.po --- xfce4-xkb-plugin-0.7.1/po/it.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/it.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,88 +3,102 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# cri , 2009,2013 +# Cristian Marchi , 2009,2013 +# oblo , 2015 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-13 10:10+0000\n" -"Last-Translator: cri \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/xfce/language/it/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-26 11:49+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Italian (http://www.transifex.com/xfce/xfce-panel-plugins/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Disposizione della tastiera" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Aspetto" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Mostra la disposizione come:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "immagine" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "testo" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Dimensione testo:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "piccolo" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "medio" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "grande" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "Comportamento" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Gestisci disposizione:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globalmente" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "per finestra" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "per applicazione" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Plugin per la disposizione della tastiera" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Permette di configurare e utilizzare diverse disposizioni della tastiera" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Altri plugin sono disponibili qui" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Impostazioni della tastiera" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Impostazione della disposizione tastiera e plugin di scelta" diff -Nru xfce4-xkb-plugin-0.7.1/po/ja.po xfce4-xkb-plugin-0.8.1/po/ja.po --- xfce4-xkb-plugin-0.7.1/po/ja.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ja.po 2017-07-26 19:23:55.000000000 +0000 @@ -5,87 +5,101 @@ # Translators: # Daichi Kawahata , 2006 # Masato HASHIMOTO , 2013 +# Nobuhiro Iwamatsu , 2016 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-12 12:52+0000\n" -"Last-Translator: Masato HASHIMOTO \n" -"Language-Team: Japanese \n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Japanese (http://www.transifex.com/xfce/xfce-panel-plugins/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "キーボードレイアウト" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "外観" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "レイアウトの表示:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "画像" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "文字" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "文字サイズ:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "小さい" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "普通" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "大きい" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "レイアウトの管理:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "システム全体" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "ウィンドウ毎" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "アプリケーション毎" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "キーボードレイアウトプラグイン" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "複数のキーボードレイアウトを構成し、使うことを許可する。" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "その他のプラグインはここにあります。" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "キーボード設定" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "キーボードレイアウトのセットアップと切替用プラグインです。" diff -Nru xfce4-xkb-plugin-0.7.1/po/kk.po xfce4-xkb-plugin-0.8.1/po/kk.po --- xfce4-xkb-plugin-0.7.1/po/kk.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/kk.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,125 +1,103 @@ -# xfce4-xkb plugin to kazakh. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Baurzhan Muftakhidinov , 2009. -# +# +# Translators: +# Baurzhan Muftakhidinov , 2009,2013,2016 msgid "" msgstr "" -"Project-Id-Version: trunk\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2009-08-16 13:12+0600\n" -"Last-Translator: Baurzhan Muftakhidinov \n" -"Language-Team: Kazakh \n" -"Language: kk\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Kazakh (http://www.transifex.com/xfce/xfce-panel-plugins/language/kk/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Language: kk\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" -msgstr "Keyboard Layouts" +msgstr "Пернетақта жаймалары" + +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Сыртқы түрі" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Жайманы қалайша көрсету:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "сурет" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "мәтін" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Мәтін өлшемі:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "кіші" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "орта" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "үлкен" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Жайманы орнату:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "глобалды" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "әр терезе үшін" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "әр қолданба үшін" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Пернетақта жаймалары плагині" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Сізге көптеген пернетақта жаймаларын баптау мен қолдануға көмектеседі." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Басқа плагиндер осында бар" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Keyboard Layouts" +msgstr "Пернетақта баптаулары" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Пернетақта жаймаларын орнату мен ауыстыру плагині" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "XKB баптауларын түзетуге баптаулар\n" -#~ "файлында тыйым салынған.\n" -#~ "\n" -#~ "Көбірек білу үшін README файлын оқыңыз." - -#~ msgid "Keyboard model:" -#~ msgstr "Пернетақта түрі:" - -#~ msgid "Change layout option:" -#~ msgstr "Жайманы ауыстыру пернелері:" - -#~ msgid "Compose key position:" -#~ msgstr "Уақытша ауыстыру пернесі:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Пернетақта жаймалары:" - -#~ msgid "Default" -#~ msgstr "Бастапқы" - -#~ msgid "Layout" -#~ msgstr "Жайма" - -#~ msgid "Variant" -#~ msgstr "Нұсқасы" - -#~ msgid "Add layout" -#~ msgstr "Жайманы қосу" diff -Nru xfce4-xkb-plugin-0.7.1/po/ko.po xfce4-xkb-plugin-0.8.1/po/ko.po --- xfce4-xkb-plugin-0.7.1/po/ko.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ko.po 2017-08-11 14:36:31.000000000 +0000 @@ -3,89 +3,108 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Darkcircle , 2013 -# Darkcircle , 2012 +# Seong-ho Cho , 2013 +# 박정규(Jung-Kyu Park) , 2017 +# Seong-ho Cho , 2012,2015 +# Sungjin Kang , 2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-07 10:34+0000\n" -"Last-Translator: Darkcircle \n" -"Language-Team: Korean (http://www.transifex.com/projects/p/xfce/language/ko/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-28 16:36+0000\n" +"Last-Translator: Sungjin Kang \n" +"Language-Team: Korean (http://www.transifex.com/xfce/xfce-panel-plugins/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "이 옵션은 현재 레이아웃 스타일에서는 지원하지 않습니다." + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" -msgstr "키보드 배치" +msgstr "키보드 레이아웃" + +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "꾸미기" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "다음 방식으로 배치 보기:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "그림" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "텍스트" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "텍스트 크기:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "작게" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "중간" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "크게" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "시스템" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "레이아웃 이름:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "국가" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "언어" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "위젯 크기:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Caps Lock 표시기:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "툴팁 아이콘:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "움직임" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "배치 관리:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "전역" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "창별" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "프로그램별" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "키보드 배치 플러그인" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "다중 키보드 배치를 설정하고 사용할 수 있게 합니다." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "다른 플러그인은 여기에 있습니다" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "키보드 설정" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "키보드 베치 설정 및 플러그인 변경" diff -Nru xfce4-xkb-plugin-0.7.1/po/lt.po xfce4-xkb-plugin-0.8.1/po/lt.po --- xfce4-xkb-plugin-0.7.1/po/lt.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/lt.po 2017-08-11 14:36:31.000000000 +0000 @@ -1,127 +1,108 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# Algimantas Margevičius , 2012. -# +# +# Translators: +# Algimantas Margevičius , 2012 +# Moo, 2015-2017 msgid "" msgstr "" -"Project-Id-Version: xkb\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2012-02-16 11:41+0200\n" -"Last-Translator: Algimantas Margevičius \n" -"Language-Team: Lietuvių <>\n" -"Language: \n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-08-07 15:46+0000\n" +"Last-Translator: Moo\n" +"Language-Team: Lithuanian (http://www.transifex.com/xfce/xfce-panel-plugins/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2)\n" +"Language: lt\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Šis parametras nėra prieinamas esamam išdėstymo stiliui" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Klaviatūros išdėstymai" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Išvaizda" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Rodyti išdėstymą kaip:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" -msgstr "paveikslėlį" +msgstr "paveikslą" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "tekstą" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Teksto dydis:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "mažas" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "vidutinis" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "didelis" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sistemą" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Išdėstymo pavadinimas:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "šalis" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "kalba" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Valdiklio dydis:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Didžiųjų raidžių indikatorius:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Paaiškinimo piktograma:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Elgsena" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Išdėstymą taikyti:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "bendrai" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "langui" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "programai" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Klaviatūros išdėstymų įskiepis" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Leidžia konfigūruoti ir naudoti kelis klaviatūros išdėstymus." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Kiti įskiepiai prieinami čia" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" -msgstr "Klaviatūros išdėstymai" +msgstr "Klaviatūros nustatymai" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" -msgstr "Klaviatūros išdėstymų nustatymo ir perjungimo įskiepis" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "XKB konfigūracijos išjungtos\n" -#~ "naudojant konfigūracijos failą.\n" -#~ "\n" -#~ "Peržiūrėkite README failą detalesnei informacijai." - -#~ msgid "Keyboard model:" -#~ msgstr "Klaviatūros modelis:" - -#~ msgid "Change layout option:" -#~ msgstr "Keisti išdėstymo būdą:" - -#~ msgid "Compose key position:" -#~ msgstr "Komponavimo klavišo pozicija:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Klaviatūros išdėstymai:" - -#~ msgid "Default" -#~ msgstr "Numatytasis" - -#~ msgid "Layout" -#~ msgstr "Išdėstymas" - -#~ msgid "Variant" -#~ msgstr "Variantas" - -#~ msgid "Add layout" -#~ msgstr "Pridėti išdėstymą" +msgstr "Klaviatūros išdėstymų sąrankos ir perjungimo įskiepis" diff -Nru xfce4-xkb-plugin-0.7.1/po/lv.po xfce4-xkb-plugin-0.8.1/po/lv.po --- xfce4-xkb-plugin-0.7.1/po/lv.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/lv.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,139 +1,104 @@ -# Latvian translation of the xfce4-xkb-plugin. -# Copyright (C) xfce4-xkb-plugin COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# -# Rihards Prieditis , 2007. -# Rihards Prieditis , 2009. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Rihards Priedītis , 2009 +# Rihards Prieditis , 2007 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2009-09-18 23:53+0100\n" -"Last-Translator: Rihards Prieditis \n" -"Language-Team: Latvian \n" -"Language: lv\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Latvian (http://www.transifex.com/xfce/xfce-panel-plugins/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " -"2);\n" +"Language: lv\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Klaviatūras izkārtojumi" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Izskats" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Rādīt izkārtojumu, kā:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "attēlu" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "tekstu" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Pārvaldīt izkārtojumu" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globāli" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "pa logam" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "pa aplikācijai" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Klaviatūras izkārtojuma spraudnis" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Ļauj konfigurēt un izmantot vairākus klaviatūru izkārtojumus" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Citi spraudņi pieejami šeit" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Klaviatūras izkārtojumi" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Klaviatūras izkārtojuma uzstādījumi un pārslēgšanas spraudnis" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "XKB konfigurācijas modifikācijas ir\n" -#~ "izslēgtas iekš konfigurācijas faila.\n" -#~ "\n" -#~ "Apskatiet README failu, lai uzzinātu ko vairāk." - -#~ msgid "Keyboard model:" -#~ msgstr "Klaviatūras modelis:" - -#~ msgid "Change layout option:" -#~ msgstr "Mainīt izkārtojuma opcijas:" - -#~ msgid "Compose key position:" -#~ msgstr "Salikt taustiņu pozīciju:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Klaviatūras izkārtojums:" - -#, fuzzy -#~ msgid "Layout" -#~ msgstr "Pievienot izkārtojumu" - -#~ msgid "Add layout" -#~ msgstr "Pievienot izkārtojumu" - -#~ msgid "" -#~ "Allows you to switch the keyboard layout and\n" -#~ "displays the currently selected layout." -#~ msgstr "" -#~ "Ļauj pārslēgt klaviatūras izkārtojumus un\n" -#~ "attēlo atlasito izkārtojumu." - -#~ msgid "Configure Keyboard Layout Switcher" -#~ msgstr "Konfigurēt Klaviatūras Izkārtojuma Pārslēdzēju" - -#~ msgid "_Remember layout for each application" -#~ msgstr "_Atcerēties izkārtojumus, katrai lietotnei" - -#~ msgid "Button to switch the X keyboard layout" -#~ msgstr "Poga, lai pārslēgtu X klaviatūras izkārtojumus" diff -Nru xfce4-xkb-plugin-0.7.1/po/Makefile.in.in xfce4-xkb-plugin-0.8.1/po/Makefile.in.in --- xfce4-xkb-plugin-0.7.1/po/Makefile.in.in 2015-02-27 23:38:54.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/Makefile.in.in 2017-09-08 20:51:33.000000000 +0000 @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -81,7 +80,7 @@ .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< @@ -109,7 +108,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -143,8 +142,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff -Nru xfce4-xkb-plugin-0.7.1/po/ms.po xfce4-xkb-plugin-0.8.1/po/ms.po --- xfce4-xkb-plugin-0.7.1/po/ms.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ms.po 2017-09-08 20:33:34.000000000 +0000 @@ -3,88 +3,105 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# abuyop , 2013 +# abuyop , 2013,2015,2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-12-03 12:49+0000\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-08-22 06:08+0000\n" "Last-Translator: abuyop \n" -"Language-Team: Malay (http://www.transifex.com/projects/p/xfce/language/ms/)\n" +"Language-Team: Malay (http://www.transifex.com/xfce/xfce-panel-plugins/language/ms/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ms\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Pilihan ini tidak tersedia untuk gaya bentangan semasa" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Bentangan Papan Kekunci" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Penampilan" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Tunjuk bentangan sebagai:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "imej" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "teks" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Saiz teks:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "kecil" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "sederhana" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "besar" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sistem" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Nama bentangan:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "negara" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "bahasa" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Saiz widjet:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Penunjuk Caps Lock:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Ikon tip alat:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Kelakuan" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Urus bentangan:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "secara sejagat" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "per tetingkap" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "per aplikasi" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Pemalam Bentangan Papan Kekunci" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Membolehkan anda konfigur dan guna bentangan papan kekunci berbilang" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Lain-lain pemalam tersedia di sini" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Tetapan papan kekunci" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Pemalam persediaan bentangan dan pertukaran papan kekunci" diff -Nru xfce4-xkb-plugin-0.7.1/po/nb.po xfce4-xkb-plugin-0.8.1/po/nb.po --- xfce4-xkb-plugin-0.7.1/po/nb.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/nb.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,89 +3,103 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# kingu , 2014 -# haarek , 2014 +# Allan Nordhøy , 2014 +# Allan Nordhøy , 2015,2017 +# Harald H. , 2014 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-05-18 16:16+0000\n" -"Last-Translator: kingu \n" -"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/xfce-panel-plugins/language/nb/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Allan Nordhøy \n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/xfce/xfce-panel-plugins/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Tastaturutforming" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Utseende" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Vis utforming som:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "bilde" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "tekst" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tekststørrelse" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "liten" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "medium" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "stor" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "system" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "Utformningsnavn:" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "land" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "språk" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "Miniprogramsstørrelse:" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "Caps Lock-indikator:" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "Verktøystipsikon:" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "Oppførsel" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Behandle utforming:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globalt" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "per vindu" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "per program" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Tastauroppsetts-tillegg" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Lar deg sette opp og bruke flerfoldige tastaturoppsett." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Andre tillegg tilgjengelig her" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Tastaturinnstillinger" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Tillegg for tastaturoppsett og veksling derav" diff -Nru xfce4-xkb-plugin-0.7.1/po/nl.po xfce4-xkb-plugin-0.8.1/po/nl.po --- xfce4-xkb-plugin-0.7.1/po/nl.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/nl.po 2017-08-11 14:36:31.000000000 +0000 @@ -3,87 +3,105 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Pjotr , 2015,2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-09-19 14:59+0000\n" -"Last-Translator: Pjotr123 \n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/xfce/language/nl/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-28 08:36+0000\n" +"Last-Translator: Pjotr \n" +"Language-Team: Dutch (http://www.transifex.com/xfce/xfce-panel-plugins/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Deze optie is niet beschikbaar voor de huidige indelingsstijl" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Toetsenbordindelingen" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Uiterlijk" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Toon indeling als:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "afbeelding" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "tekst" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tekstgrootte:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "klein" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "gemiddeld" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "groot" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "systeem" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Naam van vormgeving:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "land" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "taal" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Naam van minitoepassing:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Caps Lock-indicatie:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Pictogram voor gereedschaptip:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Gedrag" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Indeling beheren:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "systeembreed" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "per venster" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "per toepassing" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" -msgstr "Toetsenbordindelingen-invoegtoepassing" +msgstr "Toetsenbordindelingen-invoegsel" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Stelt u in staat om meerdere toetsenbordindelingen in te stellen en te gebruiken." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Andere invoegtoepassingen zijn hier beschikbaar" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Toetsenbordindelingen" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" -msgstr "Invoegtoepassing voor het instellen en veranderen van toetsenbordindelingen" +msgstr "Invoegsel voor het instellen en veranderen van toetsenbordindelingen" diff -Nru xfce4-xkb-plugin-0.7.1/po/oc.po xfce4-xkb-plugin-0.8.1/po/oc.po --- xfce4-xkb-plugin-0.7.1/po/oc.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/oc.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,88 +3,102 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Cedric31 , 2013 +# Cédric Valmary , 2016 +# Cédric Valmary , 2013 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-12-07 10:54+0000\n" -"Last-Translator: Cedric31 \n" -"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/xfce/language/oc/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/xfce/xfce-panel-plugins/language/oc/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: oc\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Disposicions del clavièr" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Aparéncia" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Afichar la disposicion en tant que :" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "imatge" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "tèxte" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Talha del tèxte :" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "pichon" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "mejan" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "grand" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Gerir la disposicion :" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globalament" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "per fenèstra" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "per aplicacion" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Empeuton de disposicion del clavièr" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Permet l'utilizacion de mantuna disposicions del clavièr." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Autres empeutons disponibles aicí" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Paramètres del clavièr" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Empeuton de disposicion del clavièr e de son cambiament" diff -Nru xfce4-xkb-plugin-0.7.1/po/pl.po xfce4-xkb-plugin-0.8.1/po/pl.po --- xfce4-xkb-plugin-0.7.1/po/pl.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/pl.po 2017-08-11 14:36:31.000000000 +0000 @@ -3,89 +3,108 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# No Ne, 2017 # Piotr Maliński , 2006 -# Piotr Sokół , 2009,2012-2013 +# Piotr Sokół , 2009,2012-2013 +# Piotr Strębski , 2015 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-08-27 20:40+0000\n" -"Last-Translator: Piotr Sokół \n" -"Language-Team: Polish (http://www.transifex.com/projects/p/xfce-panel-plugins/language/pl/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-30 20:07+0000\n" +"Last-Translator: No Ne\n" +"Language-Team: Polish (http://www.transifex.com/xfce/xfce-panel-plugins/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Ta opcja nie jest dostępna dla bieżącego stylu układu" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Układy klawiatury" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Wygląd" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Wyświetlanie" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "Ikona" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "Etykieta" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Rozmiar tekstu" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "Mały" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "Średni" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "Duży" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "system" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Nazwa układu:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "państwo" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "język" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Rozmiar widgetu:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Wskaźnik Caps Lock:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Ikona podpowiedzi:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Zachowanie" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Zastosowanie" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "Środowisko" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "Okno" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "Program" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Układy klawiatury" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Umożliwia skonfigurowanie i używanie wielu układów klawiatury" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Inne wtyczki dostępne tutaj" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Ustawienia klawiatury" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Konfiguruje i przełącza układy klawiatury" diff -Nru xfce4-xkb-plugin-0.7.1/po/POTFILES.in xfce4-xkb-plugin-0.8.1/po/POTFILES.in --- xfce4-xkb-plugin-0.7.1/po/POTFILES.in 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/POTFILES.in 2017-06-09 20:05:47.000000000 +0000 @@ -1,7 +1,8 @@ # List of source files containing translatable strings. -panel-plugin/xkb-settings-dialog.c -panel-plugin/xfce4-xkb-plugin.c +panel-plugin/xkb-dialog.c +panel-plugin/xkb-plugin.c # files added by intltool-prepare. -panel-plugin/xkb-plugin.desktop.in.in + +panel-plugin/xkb.desktop.in diff -Nru xfce4-xkb-plugin-0.7.1/po/pt_BR.po xfce4-xkb-plugin-0.8.1/po/pt_BR.po --- xfce4-xkb-plugin-0.7.1/po/pt_BR.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/pt_BR.po 2017-09-08 20:33:34.000000000 +0000 @@ -1,142 +1,114 @@ -# Brazilian Portuguese translation of the xfce4-xkb-plugin. -# Copyright (C) xfce4-xkb-plugin COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# Vladimir Melo , 2007. -# Fábio Nogueira , 2008. -# Sérgio Cipolla , 2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Andre Miranda , 2017 +# Andre Miranda , 2017 +# Fábio Nogueira , 2008 +# Marcio Andre Padula , 2015 +# Miguel V. S. Frasson , 2017 +# secipolla , 2011 +# secipolla , 2011 +# Vladimir Melo , 2007 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2011-05-26 09:32-0300\n" -"Last-Translator: Sérgio Cipolla \n" -"Language-Team: Brazilian Portuguese \n" -"Language: pt_BR\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-08-28 23:10+0000\n" +"Last-Translator: Michael Martins \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/xfce/xfce-panel-plugins/language/pt_BR/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Esta opção não está disponível para estilo de layout atual" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Disposições de teclado" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Aparência" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Mostrar disposição como:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "imagem" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "texto" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tamanho do texto:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "pequeno" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "médio" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "grande" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sistema" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Nome do layout:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "país" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "idioma" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Tamanho do widget:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Indicador de Maiúsculas:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Ícone da dica:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Comportamento" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Gerenciar disposição:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globalmente" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "por janela" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "por aplicativo" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Plug-in de disposições de teclado" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Permite configurar e usar múltiplas disposições de teclado." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Outros plug-ins disponíveis aqui" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" -msgstr "Disposições de teclado" +msgstr "Configurações de teclado" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Plug-in configurador e alternador de disposições de teclado" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "As modificações de configuração do XKB estão\n" -#~ "desabilitadas no arquivo de configuração.\n" -#~ "\n" -#~ "Veja o arquivo README para mais informações." - -#~ msgid "Keyboard model:" -#~ msgstr "Modelo do teclado:" - -#~ msgid "Change layout option:" -#~ msgstr "Opção para alterar disposição:" - -#~ msgid "Compose key position:" -#~ msgstr "Posição da tecla de composição:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Disposições de teclado:" - -#~ msgid "Default" -#~ msgstr "Padrão" - -#~ msgid "Layout" -#~ msgstr "Disposição" - -#~ msgid "Variant" -#~ msgstr "Variante" - -#~ msgid "Add layout" -#~ msgstr "Adicionar disposição" - -#~ msgid "" -#~ "Allows you to switch the keyboard layout and\n" -#~ "displays the currently selected layout." -#~ msgstr "" -#~ "Permite mudar a disposição do teclado e\n" -#~ "exibe a disposição selecionada atual." - -#~ msgid "Configure Keyboard Layout Switcher" -#~ msgstr "Configurar o Alternador de Disposição de Teclado" - -#~ msgid "_Remember layout for each application" -#~ msgstr "Lembra_r disposição para cada aplicação" - -#~ msgid "Button to switch the X keyboard layout" -#~ msgstr "Botão para alternar a disposição do teclado do X" diff -Nru xfce4-xkb-plugin-0.7.1/po/pt.po xfce4-xkb-plugin-0.8.1/po/pt.po --- xfce4-xkb-plugin-0.7.1/po/pt.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/pt.po 2017-08-11 14:36:31.000000000 +0000 @@ -1,127 +1,110 @@ -# European Portuguese translation of the xfce4-xkb-plugin. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Nuno Miguel , 2007. -# +# +# Translators: +# José Vieira , 2017 +# Nuno Miguel , 2007 +# Nuno Miguel , 2015,2017 +# Sérgio Marques , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2012-01-09 16:22-0000\n" -"Last-Translator: Sérgio Marques \n" -"Language-Team: \n" -"Language: \n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-08-08 09:58+0000\n" +"Last-Translator: José Vieira \n" +"Language-Team: Portuguese (http://www.transifex.com/xfce/xfce-panel-plugins/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: PORTUGAL\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Esta opção não está disponível para o esquema actual" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Esquemas de teclado" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Aparência" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Mostrar esquema como:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "imagem" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "texto" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Tamanho do texto:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "pequeno" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "médio" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "grande" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sistema" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Esquema do nome:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "país" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "idioma" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Tamanho do módulo:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Indicador de caps lock:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Ícone de dica:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Comportamento" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Gerir esquema:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globalmente" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "por janela" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "por aplicação" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "\"Plug-in\" de esquema de teclado" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Permite-lhe configurar e utilizar diversos esquemas de teclado." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Outros \"plug-ins\" aqui" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" -msgstr "Esquemas de teclado" +msgstr "Definições do teclado" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "\"Plug-in\" de configuração do esquema do teclado" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "As modificações na configuração XKB estão\n" -#~ "inativas no ficheiro config.\n" -#~ "\n" -#~ "Veja o ficheiro README para mais informações." - -#~ msgid "Keyboard model:" -#~ msgstr "Modelo do teclado:" - -#~ msgid "Change layout option:" -#~ msgstr "Alterar esquema:" - -#~ msgid "Compose key position:" -#~ msgstr "Definir posição de tecla:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Esquemas de teclado:" - -#~ msgid "Default" -#~ msgstr "Omissões" - -#~ msgid "Layout" -#~ msgstr "Esquema" - -#~ msgid "Variant" -#~ msgstr "Variante" - -#~ msgid "Add layout" -#~ msgstr "Adicionar esquema" diff -Nru xfce4-xkb-plugin-0.7.1/po/ro.po xfce4-xkb-plugin-0.8.1/po/ro.po --- xfce4-xkb-plugin-0.7.1/po/ro.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ro.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,120 +1,103 @@ -# Romanian translation for xfce4-xkb-plugin -# Copyright (C) 2009 -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# Igor Știrbu , 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Igor Știrbu , 2009 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2009-03-01 18:37+0200\n" -"Last-Translator: Igor Știrbu \n" -"Language-Team: Romanian \n" -"Language: ro\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Romanian (http://www.transifex.com/xfce/xfce-panel-plugins/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Aranjamente de tastatură" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Aspect" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Arată aranjamentul ca:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "imagine" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "text" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Gestionare aranjamente:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "global" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "per fereastră" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "per aplicație" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Modul pentru aranjamente de tastatură" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." -msgstr "" -"Permite configurarea și utilizarea mai multor aranjamente de tastatură." - -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Alte module disponibile aici" +msgstr "Permite configurarea și utilizarea mai multor aranjamente de tastatură." -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Aranjamente de tastatură" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Modul pentru opțiunile aranjamentelor de tastatură" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "Modificările opțiunilor XKB sunt \n" -#~ "dezactivate din fișierul de configurare.\n" -#~ "\n" -#~ "A se vedea fișierul README pentru detalii." - -#~ msgid "Keyboard model:" -#~ msgstr "Model tastatură:" - -#~ msgid "Change layout option:" -#~ msgstr "Schimbare aranjament:" - -#~ msgid "Compose key position:" -#~ msgstr "Poziție tasta «Compose»:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Aranjamente de tastatură:" - -#, fuzzy -#~ msgid "Layout" -#~ msgstr "Adaugă un aranjament" - -#~ msgid "Add layout" -#~ msgstr "Adaugă un aranjament" diff -Nru xfce4-xkb-plugin-0.7.1/po/ru.po xfce4-xkb-plugin-0.8.1/po/ru.po --- xfce4-xkb-plugin-0.7.1/po/ru.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ru.po 2017-08-11 14:36:31.000000000 +0000 @@ -1,125 +1,110 @@ -# Translation of xfce4-xkb-plugin to Russian -# +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce4-xkb-plugin package. -# -# Artem Zolochevskiy , 2011. -# +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Artem Zolochevskiy , 2011 +# Igor , 2017 +# Sergey Alyoshin , 2015-2016 +# Viktor Odintsev , 2017 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 00:09+0400\n" -"PO-Revision-Date: 2013-03-17 00:11+0400\n" -"Last-Translator: Sergey Alyoshin \n" -"Language-Team: Russian \n" -"Language: ru\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-08-09 19:46+0000\n" +"Last-Translator: Viktor Odintsev \n" +"Language-Team: Russian (http://www.transifex.com/xfce/xfce-panel-plugins/language/ru/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Данная опция недоступна для текущего стиля раскладки" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Раскладки клавиатуры" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Внешний вид" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Стиль отображения:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "значок" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "текст" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Размер индикатора:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "мелкий" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "средний" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "крупный" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "системный" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Название раскладки:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "страна" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "язык" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Размер виджета:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Индикатор Caps Lock:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Значок подсказок:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Поведение:" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Управление раскладками:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "глобально" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "для каждого окна" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "для каждого приложения" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" -msgstr "Раскладки клавиатуры" +msgstr "Модуль раскладок клавиатуры" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Позволяет настроить и использовать несколько клавиатурных раскладок." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Другие расширения доступны здесь" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" -msgstr "Настройки клавиатуры" +msgstr "Настройка клавиатуры" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Настройка и переключение клавиатурных раскладок" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "Возможность внесения изменений в настройки XKB\n" -#~ "отключена в конфигурационном файле.\n" -#~ "\n" -#~ "Подробности смотрите в файле README." - -#~ msgid "Keyboard model:" -#~ msgstr "Модель клавиатуры:" - -#~ msgid "Change layout option:" -#~ msgstr "Переключение раскладки:" - -#~ msgid "Compose key position:" -#~ msgstr "Расположение клавиши Compose:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Раскладки клавиатуры:" - -#~ msgid "Default" -#~ msgstr "По умолчанию" - -#~ msgid "Layout" -#~ msgstr "Раскладка" - -#~ msgid "Variant" -#~ msgstr "Вариант" - -#~ msgid "Add layout" -#~ msgstr "Добавить раскладку" diff -Nru xfce4-xkb-plugin-0.7.1/po/sk.po xfce4-xkb-plugin-0.8.1/po/sk.po --- xfce4-xkb-plugin-0.7.1/po/sk.po 2015-02-27 22:00:46.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/sk.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dušan Kazik , 2015,2017 # Robert Hartl , 2009 # Slavko , 2015 # Tomáš Vadina , 2011 @@ -10,83 +11,96 @@ msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2015-02-26 11:35+0000\n" -"Last-Translator: Slavko \n" -"Language-Team: Slovak (http://www.transifex.com/projects/p/xfce-panel-plugins/language/sk/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Dušan Kazik \n" +"Language-Team: Slovak (http://www.transifex.com/xfce/xfce-panel-plugins/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Rozloženie klávesnice" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Vzhľad" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Zobraziť rozloženie ako:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "obrázok" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "text" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Veľkosť textu:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "malá" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "stredná" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "veľká" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "systémový" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "Názov rozloženia:" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "krajina" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "jazyk" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "Veľkosť miniaplikácie:" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "Indikátor funkcie Caps Lock:" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "Ikona tipu:" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "Správanie" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Spravovať rozloženie:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globálne" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "pre jednotlivé okná" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "pre jednotlivé aplikácie" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Prepínač rozloženia klávesnice" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Umožňuje konfigurovať a používať viac rozložení klávesnice." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Ďalšie zásuvné moduly sú dostupné tu" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Nastavenia klávesnice" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Nastavuje a prepína rozloženie klávesnice" diff -Nru xfce4-xkb-plugin-0.7.1/po/sl.po xfce4-xkb-plugin-0.8.1/po/sl.po --- xfce4-xkb-plugin-0.7.1/po/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/sl.po 2017-07-26 19:23:55.000000000 +0000 @@ -0,0 +1,103 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# ツ Kernc, 2017 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Panel Plugins\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: ツ Kernc\n" +"Language-Team: Slovenian (http://www.transifex.com/xfce/xfce-panel-plugins/language/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 +msgid "Keyboard Layouts" +msgstr "Razporeditve tipk" + +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Izgled" + +#: ../panel-plugin/xkb-dialog.c:108 +msgid "Show layout as:" +msgstr "Pokaži razporeditev kot:" + +#: ../panel-plugin/xkb-dialog.c:114 +msgid "image" +msgstr "sliko" + +#: ../panel-plugin/xkb-dialog.c:115 +msgid "text" +msgstr "besedilo" + +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "sistemsko" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "Ime razporeditve" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "država" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "jezik" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "Velikost vstavka:" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "Indikator tipke Caps Lock:" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "Ikona orodnega namiga:" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "Obnašanje" + +#: ../panel-plugin/xkb-dialog.c:182 +msgid "Manage layout:" +msgstr "Nastavi razporeditev:" + +#: ../panel-plugin/xkb-dialog.c:188 +msgid "globally" +msgstr "globalno" + +#: ../panel-plugin/xkb-dialog.c:189 +msgid "per window" +msgstr "za vsako okno posebej" + +#: ../panel-plugin/xkb-dialog.c:190 +msgid "per application" +msgstr "za vsak program posebej" + +#: ../panel-plugin/xkb-dialog.c:259 +msgid "Keyboard Layouts Plugin" +msgstr "Razporeditev tipk" + +#: ../panel-plugin/xkb-dialog.c:261 +msgid "Allows you to configure and use multiple keyboard layouts." +msgstr "Omogoča prilagajanje in preklapljanje med večimi razporeditvami tipk" + +#: ../panel-plugin/xkb-plugin.c:260 +msgid "Keyboard settings" +msgstr "Nastavitve tipkovnice" + +#: ../panel-plugin/xkb.desktop.in.h:2 +msgid "Keyboard layouts setup and switch plugin" +msgstr "Prilagoditev / preklapljanje razporeditve tipk" diff -Nru xfce4-xkb-plugin-0.7.1/po/sq.po xfce4-xkb-plugin-0.8.1/po/sq.po --- xfce4-xkb-plugin-0.7.1/po/sq.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/sq.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,115 +1,103 @@ -# Albanian translation of the xfce4-rss-plugin package. -# Copyright (C) 2006 Adriano Winter Bess -# This file is distributed under the same license as the xfce4-rss-plugin package. -# Besnik Bleta , 2007. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Besnik , 2007 msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin v0.0.1\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2008-11-04 23:37+0200\n" -"Last-Translator: Besnik Bleta \n" -"Language-Team: Albanian \n" -"Language: sq\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Albanian (http://www.transifex.com/xfce/xfce-panel-plugins/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Skema Tastiere" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Dukje" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Shfaq skemë si:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "pamje" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "tekst" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Administroni stil:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "globalisht" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "për dritare" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "për zbatim" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Shtojcë Skemash Tastiere" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Ju lejon të formësoni dhe përdorni shumë skema tastiere njëherësh." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Të tjera shtojca të passhme prej këtej" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "Skema Tastiere" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Shtojcë rregullimi dhe këmbimi skemash tastiere" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "Ndryshimet për formësime të XKB-së\n" -#~ "janë çaktivizuar te kartela e formësimit.\n" -#~ "\n" -#~ "Për më tepër të dhëna shihni kartelën README." - -#~ msgid "Keyboard model:" -#~ msgstr "Model tastiere:" - -#~ msgid "Change layout option:" -#~ msgstr "Ndryshoni mundësi skemash:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "Skema tastierash:" - -#, fuzzy -#~ msgid "Layout" -#~ msgstr "Shtoni skeme" - -#~ msgid "Add layout" -#~ msgstr "Shtoni skeme" diff -Nru xfce4-xkb-plugin-0.7.1/po/sr.po xfce4-xkb-plugin-0.8.1/po/sr.po --- xfce4-xkb-plugin-0.7.1/po/sr.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/sr.po 2017-07-26 19:23:55.000000000 +0000 @@ -3,88 +3,102 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# salepetronije , 2012-2013 +# Саша Петровић , 2012-2013 +# Саша Петровић , 2015 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-08 12:48+0000\n" -"Last-Translator: salepetronije \n" -"Language-Team: Serbian (http://www.transifex.com/projects/p/xfce/language/sr/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Serbian (http://www.transifex.com/xfce/xfce-panel-plugins/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Распореди тастатуре" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Изглед" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Приказ распоред као:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" -msgstr "слика" +msgstr "слику" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" -msgstr "текст" +msgstr "натпис" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Величина текста:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "мали" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "средњи" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "велики" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Управљај распоредом:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "опште" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "за сваки прозор" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "по програму" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Прикључци распореда тастатуре" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Омогућава да подесите и користите вишеструке распореде тастатуре" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Други прикључци доступни овде" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Поставке тастатуре" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" -msgstr "Подешавање распореда тастатуре и прикључка за измену" +msgstr "Подешавање распореда тастатуре и прикључка измене" diff -Nru xfce4-xkb-plugin-0.7.1/po/sv.po xfce4-xkb-plugin-0.8.1/po/sv.po --- xfce4-xkb-plugin-0.7.1/po/sv.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/sv.po 2017-08-11 14:36:31.000000000 +0000 @@ -4,87 +4,105 @@ # # Translators: # Daniel Nylander , 2008-2009 +# Påvel Nicklasson , 2015 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-04-05 09:37+0000\n" -"Last-Translator: PavelNicklasson \n" -"Language-Team: Swedish (http://www.transifex.com/projects/p/xfce/language/sv/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-30 20:03+0000\n" +"Last-Translator: Påvel Nicklasson \n" +"Language-Team: Swedish (http://www.transifex.com/xfce/xfce-panel-plugins/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Detta alternativ är inte tillgängligt för aktuell layoutstil" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Tangentbordslayouter" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Utseende" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Visa layout som:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "bild" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "text" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Textstorlek:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "liten" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "medium" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "stor" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "system" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Layoutnamn:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "land" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "språk" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Widget-storlek:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Caps Lock-indikator" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Verktygstipsikon:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Beteende" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Hantera layout:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "globalt" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "per fönster" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "per program" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Insticksmodul för tangentbordslayouter" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Låter dig konfigurera och använda flera olika tangentbordslayouter." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Andra insticksmoduler tillgängliga här" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Tangentbordsinställningar" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Insticksmodul för konfigurering och växling av tangentbordslayouter" diff -Nru xfce4-xkb-plugin-0.7.1/po/th.po xfce4-xkb-plugin-0.8.1/po/th.po --- xfce4-xkb-plugin-0.7.1/po/th.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/th.po 2017-07-26 19:23:55.000000000 +0000 @@ -4,87 +4,102 @@ # # Translators: # Theppitak Karoonboonyanan , 2014 +# Theppitak Karoonboonyanan , 2015 +# Theppitak Karoonboonyanan , 2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-03-06 08:16+0000\n" -"Last-Translator: theppitak \n" -"Language-Team: Thai (http://www.transifex.com/projects/p/xfce/language/th/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Thai (http://www.transifex.com/xfce/xfce-panel-plugins/language/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: th\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "ผังแป้นพิมพ์" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "รูปปรากฏ" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "วิธีแสดงผัง:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "รูปภาพ" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "ข้อความ" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "ขนาดของข้อความ:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "เล็ก" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "กลาง" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "ใหญ่" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "ระบบ" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "ชื่อผัง:" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "ประเทศ" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "ภาษา" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "ขนาดวิดเจ็ต:" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "ไอคอนในคำแนะนำเครื่องมือ:" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "พฤติกรรม" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "จัดการผัง:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "ทั่วทั้งเดสก์ท็อป" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "รายหน้าต่าง" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "รายโปรแกรม" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "ปลั๊กอินผังแป้นพิมพ์" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "ช่วยคุณตั้งค่าและใช้ผังแป้นพิมพ์หลายผัง" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "มีปลั๊กอินอื่นๆ ที่นี่" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "ตั้งค่าแป้นพิมพ์" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "ปลั๊กอินตั้งค่าและสลับผังแป้นพิมพ์" diff -Nru xfce4-xkb-plugin-0.7.1/po/tr.po xfce4-xkb-plugin-0.8.1/po/tr.po --- xfce4-xkb-plugin-0.7.1/po/tr.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/tr.po 2017-09-08 20:33:34.000000000 +0000 @@ -3,88 +3,105 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Necdet Yücel , 2013 +# Necdet Yücel , 2013,2015,2017 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-08-02 13:16+0000\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-09-06 13:14+0000\n" "Last-Translator: Necdet Yücel \n" -"Language-Team: Turkish (http://www.transifex.com/projects/p/xfce/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/xfce/xfce-panel-plugins/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "Bu seçenek mevcut düzen biçemi için kullanılamaz" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Klavye Yerleşimleri" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "Görünüm" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "Yerleşimi şu şekilde göster:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "resim" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "yazı" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Metin boyutu:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "küçük" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "orta" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "büyük" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "sistem" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "Yerleşim adı:" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "ülke" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "dil" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "Pencere boyutu:" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "Büyük Harf göstergesi:" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "Tooltip simgesi:" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "Davranış" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "Yerleşimi yönet:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "genel olarak" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "pencere için" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "uygulama için" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "Klavye Yerleşimleri Eklentisi" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Birden fazla klavye yerleşimi kullanmanızı ve yapılandırmanızı sağlar." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Diğer eklentilere ulaşmak için" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "Klavye ayarları" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Klavye yerleşimi yapılandırma ve değiştirme eklentisi" diff -Nru xfce4-xkb-plugin-0.7.1/po/ug.po xfce4-xkb-plugin-0.8.1/po/ug.po --- xfce4-xkb-plugin-0.7.1/po/ug.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ug.po 2017-07-26 19:23:55.000000000 +0000 @@ -7,83 +7,96 @@ msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-17 06:46+0000\n" -"Last-Translator: kawichi\n" -"Language-Team: Uighur (http://www.transifex.com/projects/p/xfce/language/ug/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Uighur (http://www.transifex.com/xfce/xfce-panel-plugins/language/ug/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ug\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "كۆرۈنۈشى" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "ئورۇنلاشتۇرۇلۇشىنى مۇنداق كۆرسەتسۇن:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "سۈرەت" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "تېكىست" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "تېكىست چوڭلۇقى:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "كىچىك" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "ئوتتۇرا" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "چوڭ" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "ئورۇنلاشتۇرۇلۇشىنى باشقۇرۇش:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "سىستېمىدا" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "ھەر بىر كۆزنەكتە" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "ھەر بىر پروگراممىدا" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى قىستۇرمىسى" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "بىر نەچچە ھەرپتاختا ئورۇنلاشتۇرۇلۇشى تەڭشەپ، ئۇنى ئىشلەتكىلى بولىدىغان قىلىدۇ." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "باشقا قىستۇرمىلارمۇ بار." - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشىنى تەڭشەش ۋە ئالماشتۇرۇش قىستۇرمىسىدۇر." diff -Nru xfce4-xkb-plugin-0.7.1/po/uk.po xfce4-xkb-plugin-0.8.1/po/uk.po --- xfce4-xkb-plugin-0.7.1/po/uk.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/uk.po 2017-07-26 19:23:55.000000000 +0000 @@ -4,88 +4,101 @@ # # Translators: # Dmitry Nikitin , 2007 -# Yarema aka Knedlyk , 2013 +# Yarema aka Knedlyk , 2013,2015 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-07-27 22:34+0000\n" -"Last-Translator: Yarema aka Knedlyk \n" -"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfce/language/uk/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Ukrainian (http://www.transifex.com/xfce/xfce-panel-plugins/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Розкладки клавіатури" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "Зовнішній вигляд" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Показувати розкладки як:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "малюнок" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "текст" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Розмір тексту:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "малий" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "середній" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "великий" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Керувати розкладками:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "глобально" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "для вікна" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "для програми" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Розширення - Розкладки клавіатури" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Дозволяє Вам налаштувати і використовувати кілька розкладок клавіатури." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Інші доповнення доступні тут" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Налаштування клавіатури" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Розширення для налаштування розкладок клавіатури та їх перемикання" diff -Nru xfce4-xkb-plugin-0.7.1/po/ur_PK.po xfce4-xkb-plugin-0.8.1/po/ur_PK.po --- xfce4-xkb-plugin-0.7.1/po/ur_PK.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ur_PK.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,139 +1,102 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# +# +# Translators: msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2009-05-14 03:30+0500\n" -"Last-Translator: Muhammad Ali Makki \n" -"Language-Team: Urdu \n" -"Language: ur\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Urdu (Pakistan) (http://www.transifex.com/xfce/xfce-panel-plugins/language/ur_PK/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Urdu\n" -"X-Poedit-Country: PAKISTAN\n" -"X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: ur_PK\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "کیبورڈ خاکے" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "مظہر" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "خاکہ ظاہر کریں بطور:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "تصویر" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "متن" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "خاکے مرتب کریں:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "کُل طور پر" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "فی ونڈو" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "فی اطلاقیہ" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "کیبورڈ خاکہ پلگ ان" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "آپ کو متعدد کیبورڈ خاکے استعمال کرنے اور وضع کرنے کی صلاحیت دیتا ہے." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "دیگر پلگ ان یہاں دستیاب ہیں" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "کیبورڈ خاکے" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "کیبورڈ خاکہ ترتیبات اور مبدل" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "ایکس کے بی XKB وضع کاری تبدیلیاں\n" -#~ "کانفگ فائل میں معطل ہیں.\n" -#~ "\n" -#~ "مزید معلومات کے لیے ریڈ می README دیکھیں." - -#~ msgid "Keyboard model:" -#~ msgstr "کیبورڈ ماڈل:" - -#~ msgid "Change layout option:" -#~ msgstr "خاکہ اختیارات تبدیل کریں:" - -#~ msgid "Compose key position:" -#~ msgstr "کیبورڈ مقام لکھیں:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "کیبورڈ خاکے:" - -#, fuzzy -#~ msgid "Layout" -#~ msgstr "خاکہ شامل کریں" - -#~ msgid "Add layout" -#~ msgstr "خاکہ شامل کریں" - -#~ msgid "" -#~ "Allows you to switch the keyboard layout and\n" -#~ "displays the currently selected layout." -#~ msgstr "" -#~ "آپ کو کی بورڈ خاکہ تبدیل کرنے اور حالیہ منتخب\n" -#~ "کردہ خاکے ظاہر کرنے کی صلاحیت دیتا ہے." - -#~ msgid "Configure Keyboard Layout Switcher" -#~ msgstr "کی بورڈ خاکہ مبدل تشکیل دیں" - -#~ msgid "_Remember layout for each application" -#~ msgstr "ہر اطلاقیہ کا خاکہ _یاد رکھیں" - -#~ msgid "Button to switch the X keyboard layout" -#~ msgstr "بٹن برائے تبدیلی X کی بورڈ خاکہ" diff -Nru xfce4-xkb-plugin-0.7.1/po/ur.po xfce4-xkb-plugin-0.8.1/po/ur.po --- xfce4-xkb-plugin-0.7.1/po/ur.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/ur.po 2017-07-26 19:23:55.000000000 +0000 @@ -1,139 +1,102 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# +# +# Translators: msgid "" msgstr "" -"Project-Id-Version: xfce4-xkb-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-27 22:05-0400\n" -"PO-Revision-Date: 2009-05-14 03:30+0500\n" -"Last-Translator: Muhammad Ali Makki \n" -"Language-Team: Urdu \n" -"Language: ur\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Urdu (http://www.transifex.com/xfce/xfce-panel-plugins/language/ur/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Urdu\n" -"X-Poedit-Country: PAKISTAN\n" -"X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: ur\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "کیبورڈ خاکے" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "مظہر" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "خاکہ ظاہر کریں بطور:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "تصویر" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "متن" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "خاکے مرتب کریں:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "کُل طور پر" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "فی ونڈو" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "فی اطلاقیہ" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "کیبورڈ خاکہ پلگ ان" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "آپ کو متعدد کیبورڈ خاکے استعمال کرنے اور وضع کرنے کی صلاحیت دیتا ہے." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "دیگر پلگ ان یہاں دستیاب ہیں" - -#: ../panel-plugin/xfce4-xkb-plugin.c:125 -#, fuzzy +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" -msgstr "کیبورڈ خاکے" +msgstr "" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "کیبورڈ خاکہ ترتیبات اور مبدل" - -#~ msgid "" -#~ "XKB configuration modifications are\n" -#~ "disabled from the config file.\n" -#~ "\n" -#~ "See the README file for more information." -#~ msgstr "" -#~ "ایکس کے بی XKB وضع کاری تبدیلیاں\n" -#~ "کانفگ فائل میں معطل ہیں.\n" -#~ "\n" -#~ "مزید معلومات کے لیے ریڈ می README دیکھیں." - -#~ msgid "Keyboard model:" -#~ msgstr "کیبورڈ ماڈل:" - -#~ msgid "Change layout option:" -#~ msgstr "خاکہ اختیارات تبدیل کریں:" - -#~ msgid "Compose key position:" -#~ msgstr "کیبورڈ مقام لکھیں:" - -#~ msgid "Keyboard layouts:" -#~ msgstr "کیبورڈ خاکے:" - -#, fuzzy -#~ msgid "Layout" -#~ msgstr "خاکہ شامل کریں" - -#~ msgid "Add layout" -#~ msgstr "خاکہ شامل کریں" - -#~ msgid "" -#~ "Allows you to switch the keyboard layout and\n" -#~ "displays the currently selected layout." -#~ msgstr "" -#~ "آپ کو کی بورڈ خاکہ تبدیل کرنے اور حالیہ منتخب\n" -#~ "کردہ خاکے ظاہر کرنے کی صلاحیت دیتا ہے." - -#~ msgid "Configure Keyboard Layout Switcher" -#~ msgstr "کی بورڈ خاکہ مبدل تشکیل دیں" - -#~ msgid "_Remember layout for each application" -#~ msgstr "ہر اطلاقیہ کا خاکہ _یاد رکھیں" - -#~ msgid "Button to switch the X keyboard layout" -#~ msgstr "بٹن برائے تبدیلی X کی بورڈ خاکہ" diff -Nru xfce4-xkb-plugin-0.7.1/po/uz@Latn.po xfce4-xkb-plugin-0.8.1/po/uz@Latn.po --- xfce4-xkb-plugin-0.7.1/po/uz@Latn.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/uz@Latn.po 2017-07-26 19:23:55.000000000 +0000 @@ -8,83 +8,96 @@ msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2014-01-10 09:23+0000\n" -"Last-Translator: Umidjon Almasov \n" -"Language-Team: Uzbek (Latin) (http://www.transifex.com/projects/p/xfce/language/uz@Latn/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Uzbek (Latin) (http://www.transifex.com/xfce/xfce-panel-plugins/language/uz@Latn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uz@Latn\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Klaviatura joylashuvlari" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Joylashuvni quyidagicha ko'rsatish:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "tasvir" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "matn" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Matn hajmi:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "kichik" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "o'rtacha" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "katta" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Joylashuvni boshqarish:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "global" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "har bir oyna uchun" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "har bir dastur uchun" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Klaviatura joylashuvlari plagini" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Bir nechta klaviatura joylashuvlarini sozlash va ulardan foydalanish imkonini beradi." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Boshqa plaginlar shu joyda mavjud" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Klaviatura sozlamalari" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Klaviatura joylashuvlarini sozlash va o'zgartirish plagini" diff -Nru xfce4-xkb-plugin-0.7.1/po/uz.po xfce4-xkb-plugin-0.8.1/po/uz.po --- xfce4-xkb-plugin-0.7.1/po/uz.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/uz.po 2017-07-26 19:23:55.000000000 +0000 @@ -8,83 +8,96 @@ msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-12-20 12:37+0000\n" -"Last-Translator: Umidjon Almasov \n" -"Language-Team: Uzbek (http://www.transifex.com/projects/p/xfce/language/uz/)\n" +"POT-Creation-Date: 2017-07-02 00:31+0200\n" +"PO-Revision-Date: 2017-07-25 11:28+0000\n" +"Last-Translator: Xfce Bot \n" +"Language-Team: Uzbek (http://www.transifex.com/xfce/xfce-panel-plugins/language/uz/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uz\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:82 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "Klaviatura joylashuvlari" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:98 +msgid "Appearance" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:108 msgid "Show layout as:" msgstr "Joylashuvni quyidagicha ko'rsatish:" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:114 msgid "image" msgstr "tasvir" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:115 msgid "text" msgstr "matn" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "Matn hajmi:" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "kichik" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "o'rtacha" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "katta" +#: ../panel-plugin/xkb-dialog.c:116 +msgid "system" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:122 +msgid "Layout name:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:128 +msgid "country" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:129 +msgid "language" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:135 +msgid "Widget size:" +msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:148 +msgid "Caps Lock indicator:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:160 +msgid "Tooltip icon:" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:172 +msgid "Behavior" +msgstr "" + +#: ../panel-plugin/xkb-dialog.c:182 msgid "Manage layout:" msgstr "Joylashuvni boshqarish:" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:188 msgid "globally" msgstr "global" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:189 msgid "per window" msgstr "har bir oyna uchun" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:190 msgid "per application" msgstr "har bir dastur uchun" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:259 msgid "Keyboard Layouts Plugin" msgstr "Klaviatura joylashuvlari plagini" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:261 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "Bir nechta klaviatura joylashuvlarini sozlash va ulardan foydalanish imkonini beradi." -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "Boshqa plaginlar shu joyda mavjud" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:260 msgid "Keyboard settings" msgstr "Klaviatura sozlamalari" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "Klaviatura joylashuvlarini sozlash va o'zgartirish plagini" diff -Nru xfce4-xkb-plugin-0.7.1/po/zh_CN.po xfce4-xkb-plugin-0.8.1/po/zh_CN.po --- xfce4-xkb-plugin-0.7.1/po/zh_CN.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/zh_CN.po 2017-08-11 14:36:31.000000000 +0000 @@ -5,88 +5,109 @@ # Translators: # Chipong Luo , 2011-2012 # Hunt Xu , 2008-2009 +# wwj402 , 2017 # 玉堂白鹤 , 2013 +# 张诚 , 2017 +# 玉堂白鹤 , 2017 +# Mingcong Bai , 2015 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-09-11 14:54+0000\n" -"Last-Translator: 玉堂白鹤 \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-28 02:21+0000\n" +"Last-Translator: 张诚 \n" +"Language-Team: Chinese (China) (http://www.transifex.com/xfce/xfce-panel-plugins/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "该选项对当前的键盘布局样式无效" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "键盘布局" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "外观" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "显示布局为：" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "图片" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "文字" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "文字大小：" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "小" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "中" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "大" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "系统" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "布局名称：" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "国家" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "语言" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "控件大小：" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "大写锁定指示器：" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "工具提示图标：" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "行为" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "管理布局：" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "全局" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "每个窗口" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "每个应用程序" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "键盘布局插件" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "让您配置并使用多种键盘布局。" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "在此处可用的其它插件" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "键盘设置" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "键盘布局设置和切换插件" diff -Nru xfce4-xkb-plugin-0.7.1/po/zh_TW.po xfce4-xkb-plugin-0.8.1/po/zh_TW.po --- xfce4-xkb-plugin-0.7.1/po/zh_TW.po 2015-02-27 21:57:16.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/po/zh_TW.po 2017-08-11 14:36:31.000000000 +0000 @@ -4,88 +4,106 @@ # # Translators: # Cosmo Chene , 2006 +# Jeff Huang , 2015,2017 # Walter Cheuk , 2013 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-03 21:34+0200\n" -"PO-Revision-Date: 2013-10-12 14:17+0000\n" -"Last-Translator: Walter Cheuk \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/xfce/language/zh_TW/)\n" +"POT-Creation-Date: 2017-07-27 00:32+0200\n" +"PO-Revision-Date: 2017-07-28 03:17+0000\n" +"Last-Translator: Jeff Huang \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/xfce/xfce-panel-plugins/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/xkb-settings-dialog.c:112 -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 +#: ../panel-plugin/xkb-dialog.c:76 +msgid "This option is not available for current layout style" +msgstr "此選項未在目前的佈局樣式中提供" + +#: ../panel-plugin/xkb-dialog.c:105 ../panel-plugin/xkb.desktop.in.h:1 msgid "Keyboard Layouts" msgstr "鍵盤配置" -#. *** -#: ../panel-plugin/xkb-settings-dialog.c:122 +#: ../panel-plugin/xkb-dialog.c:121 +msgid "Appearance" +msgstr "外觀" + +#: ../panel-plugin/xkb-dialog.c:131 msgid "Show layout as:" msgstr "顯示配置為：" -#: ../panel-plugin/xkb-settings-dialog.c:127 +#: ../panel-plugin/xkb-dialog.c:137 msgid "image" msgstr "影像" -#: ../panel-plugin/xkb-settings-dialog.c:128 +#: ../panel-plugin/xkb-dialog.c:138 msgid "text" msgstr "文字" -#. text size option -#: ../panel-plugin/xkb-settings-dialog.c:133 -msgid "Text size:" -msgstr "文字大小：" - -#: ../panel-plugin/xkb-settings-dialog.c:138 -msgid "small" -msgstr "小" - -#: ../panel-plugin/xkb-settings-dialog.c:139 -msgid "medium" -msgstr "中" - -#: ../panel-plugin/xkb-settings-dialog.c:140 -msgid "large" -msgstr "大" +#: ../panel-plugin/xkb-dialog.c:139 +msgid "system" +msgstr "系統" + +#: ../panel-plugin/xkb-dialog.c:145 +msgid "Layout name:" +msgstr "佈局名稱：" + +#: ../panel-plugin/xkb-dialog.c:151 +msgid "country" +msgstr "國家" + +#: ../panel-plugin/xkb-dialog.c:152 +msgid "language" +msgstr "語言" + +#: ../panel-plugin/xkb-dialog.c:158 +msgid "Widget size:" +msgstr "小工具大小：" + +#: ../panel-plugin/xkb-dialog.c:171 +msgid "Caps Lock indicator:" +msgstr "大寫鎖定鍵指示器：" + +#: ../panel-plugin/xkb-dialog.c:183 +msgid "Tooltip icon:" +msgstr "工具提示圖示：" + +#: ../panel-plugin/xkb-dialog.c:195 +msgid "Behavior" +msgstr "行為" -#: ../panel-plugin/xkb-settings-dialog.c:144 +#: ../panel-plugin/xkb-dialog.c:205 msgid "Manage layout:" msgstr "管理配置：" -#: ../panel-plugin/xkb-settings-dialog.c:149 +#: ../panel-plugin/xkb-dialog.c:211 msgid "globally" msgstr "全域" -#: ../panel-plugin/xkb-settings-dialog.c:150 +#: ../panel-plugin/xkb-dialog.c:212 msgid "per window" msgstr "各個視窗獨立" -#: ../panel-plugin/xkb-settings-dialog.c:151 +#: ../panel-plugin/xkb-dialog.c:213 msgid "per application" msgstr "各個程式獨立" -#: ../panel-plugin/xkb-settings-dialog.c:185 +#: ../panel-plugin/xkb-dialog.c:290 msgid "Keyboard Layouts Plugin" msgstr "鍵盤配置插件" -#: ../panel-plugin/xkb-settings-dialog.c:195 +#: ../panel-plugin/xkb-dialog.c:292 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "讓您設定並使用多種鍵盤配置。" -#: ../panel-plugin/xkb-settings-dialog.c:199 -msgid "Other plugins available here" -msgstr "其他可用的插件" - -#: ../panel-plugin/xfce4-xkb-plugin.c:128 +#: ../panel-plugin/xkb-plugin.c:238 msgid "Keyboard settings" msgstr "鍵盤設定" -#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2 +#: ../panel-plugin/xkb.desktop.in.h:2 msgid "Keyboard layouts setup and switch plugin" msgstr "鍵盤配置設置與切換插件" diff -Nru xfce4-xkb-plugin-0.7.1/README xfce4-xkb-plugin-0.8.1/README --- xfce4-xkb-plugin-0.7.1/README 2012-07-09 18:14:55.000000000 +0000 +++ xfce4-xkb-plugin-0.8.1/README 2017-06-09 20:05:47.000000000 +0000 @@ -4,7 +4,7 @@ =========== This plugin allows you to setup and use multiple (currently -ip to 4 due to X11 protocol limitation) keyboard layouts. +up to 4 due to X11 protocol limitation) keyboard layouts. You can choose the keyboard model, what key combination to use to switch between the layouts, the actual keyboard layouts,