diff -Nru xfce4-power-manager-1.4.4/aclocal.m4 xfce4-power-manager-1.6.1/aclocal.m4 --- xfce4-power-manager-1.4.4/aclocal.m4 2015-03-22 11:30:36.000000000 +0000 +++ xfce4-power-manager-1.6.1/aclocal.m4 2017-12-18 23:15:48.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 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_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29.1) +dnl +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.1]) +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,19 +664,17 @@ 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 @@ -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-2014 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], [], [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])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-2014 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-2014 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-2014 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-2014 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-2014 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 @@ -1258,6 +1366,9 @@ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -1287,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-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1298,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'" ;; @@ -1308,7 +1419,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1330,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-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1365,7 +1476,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1415,7 +1526,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1454,7 +1565,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1483,7 +1594,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-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1530,7 +1641,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-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1549,7 +1660,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1630,7 +1741,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1690,7 +1801,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1718,7 +1829,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1737,7 +1848,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2060,9 +2171,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 @@ -2070,36 +2179,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) @@ -2127,7 +2230,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 @@ -2151,7 +2254,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' @@ -2171,26 +2274,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"} @@ -2237,15 +2357,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 @@ -2258,7 +2379,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 @@ -2269,14 +2390,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 @@ -2329,21 +2450,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. @@ -2475,8 +2596,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"`']) @@ -2500,7 +2621,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 ]) @@ -2528,7 +2649,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], @@ -2554,8 +2675,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], @@ -2601,7 +2722,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\\\\\\"" @@ -2614,7 +2735,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\\\\\\"" @@ -2630,7 +2751,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). @@ -2652,7 +2773,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 @@ -2675,7 +2796,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. @@ -2697,7 +2818,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 ) @@ -2710,10 +2831,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 @@ -2739,7 +2860,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 @@ -2759,27 +2880,30 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -2787,13 +2911,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 @@ -2810,8 +2945,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" @@ -2829,7 +2962,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -3026,7 +3158,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 @@ -3044,7 +3176,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 @@ -3062,7 +3194,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], @@ -3084,7 +3216,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 @@ -3094,32 +3226,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= @@ -3139,29 +3271,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 @@ -3181,7 +3313,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])], @@ -3199,7 +3331,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]) @@ -3219,8 +3351,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 @@ -3248,10 +3380,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]) ;; @@ -3277,16 +3409,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 ;; #( @@ -3296,14 +3429,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 # --------------- @@ -3311,31 +3444,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" @@ -3364,9 +3499,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 @@ -3385,10 +3557,10 @@ ;; esac ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -3407,10 +3579,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -3428,19 +3600,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 @@ -3448,7 +3621,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*) @@ -3457,7 +3630,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 ;; *) @@ -3473,7 +3646,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -3492,11 +3665,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 @@ -3504,7 +3677,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 @@ -3535,7 +3708,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -3571,7 +3744,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 @@ -3598,7 +3771,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -3620,7 +3793,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 @@ -3639,10 +3812,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]) @@ -3663,7 +3836,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*) @@ -3703,7 +3876,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` @@ -3754,22 +3927,22 @@ *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + 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 @@ -3785,7 +3958,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) @@ -3813,7 +3986,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 @@ -3860,9 +4033,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 @@ -3888,7 +4061,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 @@ -3909,7 +4082,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 @@ -3919,44 +4092,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]) ]) ]) ]) @@ -3965,21 +4146,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], @@ -3989,7 +4170,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 @@ -3999,9 +4180,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -4093,8 +4274,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 @@ -4104,8 +4285,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 @@ -4132,8 +4313,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 @@ -4145,15 +4326,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 @@ -4167,12 +4348,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 @@ -4196,7 +4377,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]) @@ -4214,6 +4395,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 @@ -4224,17 +4446,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 @@ -4250,28 +4473,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--; } @@ -4285,7 +4515,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 @@ -4294,7 +4524,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -4311,14 +4541,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]]*) @@ -4326,41 +4559,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 ;; @@ -4370,18 +4653,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 ;; @@ -4389,8 +4672,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" @@ -4402,7 +4685,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -4411,8 +4694,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~ @@ -4428,17 +4711,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' @@ -4447,8 +4730,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*) @@ -4475,7 +4758,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'` @@ -4488,8 +4771,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' @@ -4502,7 +4785,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 @@ -4515,8 +4798,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`' @@ -4529,8 +4812,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 ;; @@ -4548,12 +4831,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 @@ -4583,10 +4867,10 @@ 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 ;; @@ -4604,14 +4888,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' @@ -4619,8 +4904,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 ;; @@ -4629,8 +4914,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, ... @@ -4643,8 +4928,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 @@ -4655,7 +4940,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 @@ -4663,8 +4948,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= @@ -4683,8 +4968,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 ;; @@ -4693,13 +4978,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 | 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 @@ -4724,7 +5029,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -4756,12 +5066,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 @@ -4771,7 +5081,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 ;; @@ -4780,58 +5090,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*) @@ -4842,8 +5162,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 @@ -4853,11 +5173,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 @@ -4865,8 +5185,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) @@ -4887,24 +5207,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' @@ -4922,7 +5242,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 @@ -4930,8 +5250,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 ;; @@ -4940,20 +5260,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]) @@ -4986,39 +5316,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 : @@ -5041,11 +5373,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 @@ -5063,7 +5395,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 @@ -5090,16 +5422,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` ;; @@ -5113,7 +5445,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. @@ -5124,37 +5456,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 @@ -5240,13 +5609,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]]*) @@ -5273,8 +5642,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 @@ -5370,8 +5738,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)$' @@ -5424,6 +5792,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -5464,33 +5835,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 @@ -5501,21 +5877,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=: @@ -5523,8 +5899,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 @@ -5570,8 +5946,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 @@ -5583,7 +5959,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -5610,13 +5986,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 @@ -5628,11 +6019,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]) @@ -5651,7 +6042,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' ;; @@ -5703,7 +6094,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -5736,14 +6127,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= @@ -5761,21 +6182,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'" @@ -5815,11 +6239,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 @@ -5845,7 +6269,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} }; @@ -5865,9 +6289,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 @@ -5888,7 +6312,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= @@ -5915,12 +6339,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 @@ -5936,17 +6364,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*) @@ -5957,8 +6386,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 @@ -5974,6 +6403,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 @@ -6023,7 +6457,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 @@ -6064,14 +6498,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 @@ -6108,7 +6542,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' @@ -6253,17 +6687,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*) @@ -6274,8 +6709,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 @@ -6292,6 +6727,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*) @@ -6362,7 +6802,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 @@ -6370,11 +6810,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*) @@ -6390,7 +6849,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*) @@ -6401,7 +6860,7 @@ 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' @@ -6426,6 +6885,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) @@ -6523,7 +6988,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 @@ -6552,7 +7017,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)= ;; @@ -6618,17 +7083,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 @@ -6677,9 +7146,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 @@ -6695,7 +7164,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 ;; @@ -6703,7 +7172,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; linux* | k*bsd*-gnu | gnu*) @@ -6716,7 +7185,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 @@ -6738,24 +7207,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 ... @@ -6768,7 +7237,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 @@ -6787,7 +7256,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) @@ -6803,7 +7272,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 @@ -6813,7 +7282,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 @@ -6821,61 +7290,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' ;; @@ -6886,42 +7383,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 @@ -6935,8 +7437,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 ;; @@ -6954,8 +7456,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 @@ -6967,7 +7469,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 @@ -6982,9 +7484,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 @@ -7001,15 +7503,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)= @@ -7025,7 +7527,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 @@ -7033,34 +7535,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 @@ -7079,13 +7604,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 @@ -7104,62 +7637,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 - _LT_TAGVAR(link_all_deplibs, $1)=no + # 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 ;; @@ -7168,7 +7719,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) @@ -7198,16 +7749,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 @@ -7216,18 +7768,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 @@ -7236,7 +7788,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. @@ -7286,33 +7838,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 @@ -7320,25 +7872,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, [], [ @@ -7346,14 +7898,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 @@ -7364,7 +7916,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. @@ -7375,16 +7927,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; }]], @@ -7397,21 +7949,32 @@ 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 + _LT_TAGVAR(link_all_deplibs, $1)=no 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* | netbsdelf*-gnu) 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 @@ -7426,7 +7989,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 ;; @@ -7434,27 +7997,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 @@ -7465,33 +8020,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' @@ -7502,24 +8077,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 @@ -7529,11 +8104,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 @@ -7543,10 +8118,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 @@ -7595,43 +8170,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 ;; @@ -7646,17 +8221,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 @@ -7673,7 +8248,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. @@ -7753,12 +8328,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 @@ -7799,10 +8374,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. @@ -7838,18 +8413,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' @@ -7857,8 +8432,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 @@ -7866,13 +8445,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 @@ -7880,14 +8459,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 @@ -7929,7 +8508,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;" @@ -7971,35 +8550,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 @@ -8035,18 +8614,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 @@ -8056,6 +8647,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 @@ -8074,13 +8672,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 @@ -8098,64 +8704,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 ;; @@ -8165,7 +8791,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 @@ -8193,57 +8819,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 @@ -8254,6 +8881,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++*) @@ -8289,14 +8944,14 @@ ;; 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 @@ -8308,7 +8963,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. @@ -8317,11 +8972,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 @@ -8331,15 +8986,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 @@ -8365,13 +9020,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 @@ -8382,20 +9037,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 @@ -8410,22 +9065,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 @@ -8434,17 +9089,17 @@ _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 ;; @@ -8457,8 +9112,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. @@ -8467,10 +9122,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. @@ -8484,59 +9139,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' @@ -8550,18 +9205,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 ;; *) @@ -8569,10 +9224,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 @@ -8630,22 +9285,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 @@ -8661,9 +9311,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 @@ -8681,17 +9331,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 @@ -8706,21 +9356,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 @@ -8766,9 +9416,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 @@ -8776,7 +9426,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' ;; @@ -8793,30 +9443,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 @@ -8824,11 +9474,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 @@ -8837,52 +9487,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 ;; @@ -8913,10 +9563,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 @@ -8943,7 +9593,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 @@ -8965,13 +9615,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 @@ -9055,13 +9706,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 @@ -9077,16 +9728,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 @@ -9094,9 +9745,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= @@ -9111,15 +9762,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 @@ -9150,51 +9801,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 ]) @@ -9203,7 +9809,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]) @@ -9223,10 +9829,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 @@ -9263,7 +9869,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 @@ -9285,7 +9891,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"} @@ -9299,21 +9905,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 @@ -9321,11 +9931,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 @@ -9342,9 +9952,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 @@ -9354,11 +9964,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 @@ -9395,7 +10005,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 @@ -9417,7 +10027,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"} @@ -9433,21 +10043,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 @@ -9455,11 +10069,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 @@ -9479,7 +10093,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 @@ -9489,7 +10103,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 @@ -9523,7 +10137,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. @@ -9556,7 +10170,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 @@ -9590,7 +10204,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. @@ -9623,7 +10237,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 @@ -9639,7 +10253,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 @@ -9649,7 +10263,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= @@ -9678,7 +10292,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 ]) @@ -9787,7 +10401,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 @@ -9804,9 +10418,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 @@ -9830,27 +10444,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 @@ -9874,102 +10468,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], @@ -10036,15 +10537,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])]) @@ -10065,7 +10566,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 ]) @@ -10111,13 +10612,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 @@ -10145,7 +10648,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: @@ -10181,7 +10684,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: @@ -10190,9 +10693,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], @@ -10205,14 +10708,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) @@ -10244,9 +10747,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], @@ -10259,14 +10762,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) @@ -10298,9 +10801,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], @@ -10313,14 +10816,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) @@ -10337,14 +10840,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: @@ -10352,11 +10855,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@:>@], @@ -10367,19 +10923,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 @@ -10392,7 +10946,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: @@ -10415,7 +10969,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 @@ -10448,7 +11003,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])], @@ -10459,7 +11014,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 @@ -10539,7 +11094,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 @@ -10548,22 +11103,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 @@ -10574,7 +11130,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. # @@ -10588,7 +11144,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru xfce4-power-manager-1.4.4/ChangeLog xfce4-power-manager-1.6.1/ChangeLog --- xfce4-power-manager-1.4.4/ChangeLog 2015-03-22 11:31:39.000000000 +0000 +++ xfce4-power-manager-1.6.1/ChangeLog 2017-12-18 23:15:56.000000000 +0000 @@ -1,10 +1,4549 @@ -commit 883782b8014564e367ae83ff8718b22e40193f5b -Author: Matt Thirtytwo -Date: Sat Mar 7 23:13:05 2015 +0100 +commit 19005cac60724fcc3324468c186b0b804d145d6d +Author: 玉堂白鹤 +Date: Mon Dec 18 12:31:54 2017 +0100 + + I18n: Update translation zh_CN (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f390e204b7dcaef47607ee10df3ce15b901c1ecb +Author: abuyop +Date: Wed Dec 13 18:32:01 2017 +0100 + + I18n: Update translation ms (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 08215d53c378e23543fa75da85a6521324ca907e +Author: Nuno Miguel +Date: Tue Dec 12 00:31:54 2017 +0100 + + I18n: Update translation pt (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b8970b0483e6c39b4ec0bb665e4302186b189c56 +Author: Theppitak Karoonboonyanan +Date: Mon Dec 4 12:31:52 2017 +0100 + + I18n: Update translation th (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fc67b390052cfedb0ccecbeecbad05ccfa3f7c01 +Author: Anonymous +Date: Tue Nov 28 00:32:02 2017 +0100 + + I18n: Update translation da (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f911ceb07c5f78fe72887f5438999edb2d7f6d09 +Author: Simon Steinbeiss +Date: Sun Nov 26 23:55:04 2017 +0100 + + Fix handling of dialog responses for suspend and hibernate (Bug #13405) + +commit 86b0d168955ee7b6aecde5b38c25f9ca56302630 +Author: Masato HASHIMOTO +Date: Sun Nov 26 12:31:11 2017 +0100 + + I18n: Update translation ja (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d60bb615b9b00dc4b20673795b4ee75fffebaf6f +Author: Nobuhiro Iwamatsu +Date: Fri Nov 24 06:30:57 2017 +0100 + + I18n: Update translation ja (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 27196e769d73966b1ce9ddedb0124231c46a8f9e +Author: Yogesh K S +Date: Fri Nov 24 00:31:00 2017 +0100 + + I18n: Update translation kn (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 887102604f6596cfce07631d3de701f798205b16 +Author: Simon Steinbeiss +Date: Thu Nov 23 00:33:38 2017 +0100 + + panel-plugin: Hide label by default on desktop systems + + The label will only be hidden if the display device, i.e. the one + showing up in the panel is the desktop itself. + +commit e34ace3339321b78c8d4f96668e976023a307657 +Author: Rizma Banu +Date: Thu Nov 23 12:31:01 2017 +0100 + + I18n: Add new translation kn (95%). + + 197 translated messages, 10 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8d8fce2f9de83c3b576beaf689f9e9ccc4746a54 +Author: Silvère Latchurié +Date: Wed Nov 22 18:30:58 2017 +0100 + + I18n: Update translation fr (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fd6e854b7a1a92db1c87110d0d7d7883c8ef16ef +Author: Arve Eriksson <031299870@telia.com> +Date: Wed Nov 22 00:31:17 2017 +0100 + + I18n: Update translation sv (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3cc3f17e7aa803d3bee5eb1f0b0f264c844f8e4b +Author: Simon Steinbeiss +Date: Sun Nov 19 23:25:38 2017 +0100 + + panel-plugin: Drop deprecated CSS styles + +commit d58b735197121bd27b3b016148f56c89ee862ec3 +Author: Simon Steinbeiss +Date: Sun Nov 19 23:17:55 2017 +0100 + + panel-plugin: Block panel autohide if the menu is open + +commit 560a960e663e43f319e703fb9c8e394829066a42 +Author: Simon Steinbeiss +Date: Sun Nov 19 22:01:32 2017 +0100 + + panel-plugin: Set ac-adapter icon for desktop systems (Bug #13959) + + Unfortunately UPower does not differentiate between desktop and laptop + systems so we decide that it's a desktop if it: + * is not a UPS + * does not have a battery + * does not have a lid + In this case we show the "ac-adapter" icon for the systray and the + "ac-adapter-symbolic" icon for the Xfce Panel Plugin. + + Before the "battery-missing" icon was shown, which is what UPower + reports for the display device. + +commit 8140857a588b57f7f51ed8069e1c5a0328750d84 +Author: Anonymous +Date: Fri Nov 17 18:32:43 2017 +0100 + + I18n: Update translation da (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d15cd9cfb73d24bd01059cd417d381580a3291ad +Author: Charles Monzat +Date: Thu Nov 16 00:30:59 2017 +0100 + + I18n: Update translation fr (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 72bbf8908d1ce6a900a49be2382785e294e2620a +Author: Anonymous +Date: Wed Nov 15 18:31:16 2017 +0100 + + I18n: Update translation et (65%). + + 135 translated messages, 72 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 082d0794601510645907b710199894d82adf8bf3 +Author: 박정규(Jung-Kyu Park) +Date: Tue Nov 14 18:33:13 2017 +0100 + + I18n: Update translation ko (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 73cfa5328a18de5227b3bfef43c348947b1864f6 +Author: Anonymous +Date: Tue Nov 14 12:31:47 2017 +0100 + + I18n: Update translation et (65%). + + 135 translated messages, 72 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 780ddcfb8f94271b8b07d25e5f7400fc545118f3 +Author: Allan Nordhøy +Date: Tue Nov 14 06:31:13 2017 +0100 + + I18n: Update translation nb (98%). + + 203 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d951b87283e5e590886b781747b124fb1b3a8d73 +Author: Anonymous +Date: Tue Nov 14 00:30:57 2017 +0100 + + I18n: Update translation et (64%). + + 134 translated messages, 73 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 48715c7fadbd47df6859b2db04d482dcef3d3464 +Author: Simon Steinbeiss +Date: Thu Nov 9 23:57:33 2017 +0100 + + Fix compilation warning about gtk_menu_popup + +commit 17ac6a10f741017d1c853a884ee656a964909aa2 +Author: Romain B +Date: Wed Nov 8 23:31:19 2017 +0100 + + Fix build on FreeBSD and DragonFlyBSD (Bug #13984) + + - Fix the DPMS detection by adding correct lib/cflags on Xext AC_CHECK_LIB, so -lXext is correctly added on link time (taken from xfwm4) + - Also uses XDT_CHECK_LIBX11_REQUIRE to detect X11 + +commit 33a16c15e6eb4ae3eb8fa554686b4c7fb1540c32 +Author: 박정규(Jung-Kyu Park) +Date: Thu Nov 9 12:31:48 2017 +0100 + + I18n: Update translation ko (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 446e9a96b26f37aae8d6ecb07e895793d1e67102 +Author: Tobias Bannert +Date: Wed Nov 8 00:31:08 2017 +0100 + + I18n: Update translation de (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c66ddd64ca998ca1659c16d8b7a69ceb317bba97 +Author: Vinzenz Vietzke +Date: Mon Nov 6 00:31:51 2017 +0100 + + I18n: Update translation de (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6bae7a2a70e5293b033892e4fa2da792642e5a45 +Author: Anonymous +Date: Sat Nov 4 00:31:36 2017 +0100 + + I18n: Update translation da (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7b8e203586bbfe0d5eb7e8e53fbbd6e8b60ad972 +Author: Påvel Nicklasson +Date: Fri Nov 3 18:31:53 2017 +0100 + + I18n: Update translation sv (95%). + + 197 translated messages, 10 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f5e65fbf166c8436f34a7c6f06e1fb7f4dd7b52d +Author: Elishai Eliyahu +Date: Fri Nov 3 12:31:10 2017 +0100 + + I18n: Update translation he (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 791ba4b2400b3033dfe084d6a58de9ca48a52142 +Author: Necdet Yücel +Date: Thu Nov 2 18:31:15 2017 +0100 + + I18n: Update translation tr (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 55d605bf69c5914acb339d09fdf2e7b4444fa247 +Author: Yarema aka Knedlyk +Date: Wed Nov 1 18:31:49 2017 +0100 + + I18n: Update translation uk (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4463ff3b92c1efb05677e8db368ce377199aa432 +Author: Anonymous +Date: Wed Nov 1 12:31:01 2017 +0100 + + I18n: Update translation da (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7d1e6ede682fcb22f8274f20d4827bc86c2239b2 +Author: Anonymous +Date: Wed Nov 1 06:31:11 2017 +0100 + + I18n: Update translation da (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5063eeec8ef9a8158d178e327bf59bde11b35fc4 +Author: Michal Várady +Date: Wed Nov 1 00:31:22 2017 +0100 + + I18n: Update translation cs (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 05916a78ba27d190ad1f1b253a35fae7f9416e45 +Author: Baurzhan Muftakhidinov +Date: Tue Oct 31 18:31:01 2017 +0100 + + I18n: Update translation kk (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit fc03bb1d61d4459520cc03a6b63c1a022961eb21 +Author: Michal Várady +Date: Tue Oct 31 18:31:01 2017 +0100 + + I18n: Update translation cs (97%). + + 201 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a9bd2bcd6c0eda7075c2dfc33c7ab4b76ee37bff +Author: Anonymous +Date: Tue Oct 31 12:31:01 2017 +0100 + + I18n: Update translation lt (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit da3fe9b4d99fe1e8e591a7a4311626778cda1222 +Author: Charles Monzat +Date: Tue Oct 31 12:31:01 2017 +0100 + + I18n: Update translation fr (99%). + + 205 translated messages, 2 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d585815b542762411fe6065dfc9a53a79d526458 +Author: Daniel Kubat +Date: Tue Oct 31 06:31:00 2017 +0100 + + I18n: Update translation cs (96%). + + 200 translated messages, 7 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8609017b85d584831695f19a313c6bd26117a17a +Author: Charles Monzat +Date: Tue Oct 31 00:31:52 2017 +0100 + + I18n: Update translation fr (99%). + + 205 translated messages, 2 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 54b9084364b87c70e67e0bb92742d2500f2cea0a +Author: Μιχάλης +Date: Tue Oct 31 00:31:52 2017 +0100 + + I18n: Update translation el (97%). + + 201 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 899b75206250a46d04745f2a15b600af42702195 +Author: Anonymous +Date: Tue Oct 31 00:31:52 2017 +0100 + + I18n: Update translation da (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c649323dbd80f39b196ee748bc640037dc4837e8 +Author: Simon Steinbeiss +Date: Tue Oct 31 00:28:35 2017 +0100 + + Fix xfpm startup dialog ignoring response (Bug #13700) + + Previously xfpm would be launched in any case, even if the + user chose "no" in the dialog. + +commit 32b37815dda2ad108f263176837ef628070ea2e3 +Author: Hsiu-Ming Chang +Date: Mon Oct 30 18:32:35 2017 +0100 + + I18n: Update translation zh_TW (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 20b8fa5a13b16b01fc63e1a43eb596cad8caf08c +Author: Igor +Date: Mon Oct 30 18:32:35 2017 +0100 + + I18n: Update translation ru (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b8989aed4376dfb306d7adcb84d86fd38b801576 +Author: Pjotr +Date: Mon Oct 30 18:32:35 2017 +0100 + + I18n: Update translation nl (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a766acfaf23520bec4dd77f13181d59511e67261 +Author: Edin Veskovic +Date: Mon Oct 30 18:32:35 2017 +0100 + + I18n: Update translation hr (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e1094d5ad7daae8b140878e9d8808ada07dd7f2a +Author: Sergio García +Date: Mon Oct 30 18:32:34 2017 +0100 + + I18n: Update translation es (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit abce06c5a4cbc826f59dc70ab24b5d61f0b1461d +Author: Dušan Kazik +Date: Mon Oct 30 12:31:39 2017 +0100 + + I18n: Update translation sk (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit cbe7381e759a41a6980e33759dc1f4281608e2ff +Author: Anonymous +Date: Mon Oct 30 12:31:39 2017 +0100 + + I18n: Update translation pl (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f933879734f856048da8effb79701b224873a3a0 +Author: Charles Monzat +Date: Mon Oct 30 12:31:39 2017 +0100 + + I18n: Update translation fr (98%). + + 204 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 635e98ee9c7582caebd26d23c61ea081cda9960a +Author: Kiril Kirilov +Date: Mon Oct 30 12:31:39 2017 +0100 + + I18n: Update translation bg (100%). + + 207 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 55a47aa5ab25269d73dc8a20fa701fd216688ea0 +Author: Simon Steinbeiss +Date: Mon Oct 30 00:37:09 2017 +0100 + + Replace deprecated gdk_screen_get_number + + with gdk_x11_screen_get_screen_number. Also lots of + trailing whitespace got removed. + +commit 2d321188852c385c67bfb637163323a2278be70d +Author: Simon Steinbeiss +Date: Mon Oct 30 00:32:50 2017 +0100 + + Finish migration from expose to draw signal + +commit fd35eb009562c81e6bb21c914ff58d9e8e9f9182 +Author: Simon Steinbeiss +Date: Mon Oct 30 00:05:53 2017 +0100 + + Improve .gitignore + +commit 469cc1e9aaf7cd3f74e57db578b63036d4e9ea8c +Author: Simon Steinbeiss +Date: Sun Oct 29 23:32:26 2017 +0100 + + panel-plugin: Handle out-of-bounds values of show-panel-label in config dialog + +commit e319a4932617fed22d8ddb27fe4a917f973f2e58 +Author: Simon Steinbeiss +Date: Sun Oct 29 23:28:12 2017 +0100 + + panel-plugin: Add properties dialog (Bug #13270) + + So far the only option we have there is the formerly + hidden option show-panel-label. + +commit d57fa9b2142a5989f1c78b8bee9022c895ebb9e0 +Author: Simon Steinbeiss +Date: Sun Oct 29 23:19:44 2017 +0100 + + Harmonize capitalisation of hours, minutes and seconds + +commit 1a878a57ebe95ca65387260c76b6989db4e6e2d5 +Author: Simon Steinbeiss +Date: Sun Oct 29 21:01:24 2017 +0100 + + Make tooltip more concise (Bug #12342) + +commit a3dadb8e0463945896ec46991ef2bcd23d9929f1 +Author: Simon Steinbeiss +Date: Sun Oct 29 20:59:26 2017 +0100 + + Drop period at end of all tooltip texts (Bug #12342) + +commit 0c2312e317837894356892916d498849d28ced52 +Author: Simon Steinbeiss +Date: Sun Oct 29 13:27:20 2017 +0100 + + Fix scale description and values for light-locker (Bug #13303) + + Also make the capitalisation of "minutes" and "seconds" consistent. + +commit 858883bef11dddb134ffee3d04b560236c8ce60e +Author: Simon Steinbeiss +Date: Sun Oct 29 12:45:08 2017 +0100 + + Fix type for kb/display-backlight notifications + +commit b7f948a69e3b5406b2fd419041384422e0b9d035 +Author: Simon Steinbeiss +Date: Sun Oct 29 11:39:21 2017 +0100 + + Continue with notification cleanup + +commit b1195c1b54baa9725a91966281ccb65adb08555c +Author: Simon Steinbeiss +Date: Sun Oct 29 11:03:24 2017 +0100 + + Begin cleanup of notification code + + Also use symbolic icons where possible/appropriate. + +commit 4d6f53105b2048fbe5bef3f9ea159c5304d9665a +Author: Christian Hesse +Date: Thu Sep 15 16:44:14 2016 +0200 + + panel-plugin: Hide label in unknown state (Bug #12851) + + DEVICE_STATE_UKNOWN means that there is no battery available. + + Signed-off-by: Christian Hesse + +commit 68968b5270671701a68602e3b4be74b995edc661 +Author: Viktor Odintsev +Date: Fri Sep 15 10:34:57 2017 +0300 + + Set the transient hint for notifications + +commit 1e9e5cb845820aa703155917fa1b776948aae045 +Author: Viktor Odintsev +Date: Fri Sep 15 06:48:03 2017 +0300 + + Add missing common dialog padding + +commit 0472ee774e5f0a700abbcdf87d09c22b40b69e13 +Author: Viktor Odintsev +Date: Fri Sep 15 06:32:29 2017 +0300 + + Fix menu leak, attach menu to button (Bug #13466) + +commit f1a0eebbc3e61e80204d848973de213295344752 +Author: Viktor Odintsev +Date: Fri Sep 15 06:07:27 2017 +0300 + + Fix misc compilation warnings + +commit b667211b6acc2de182d1275afc822009c22b0855 +Author: Viktor Odintsev +Date: Fri Sep 15 06:06:03 2017 +0300 + + Use libxfce4panel function to obtain desired icon size + +commit 42c6fbafc820cb4147a9dba6941baadbe00d0faf +Author: Ivica Kolić +Date: Fri Oct 27 00:31:06 2017 +0200 + + I18n: Update translation hr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2c691fe9b08ee32c7ea88e473a5d26a0799ba570 +Author: Tobias Bannert +Date: Thu Oct 5 18:31:26 2017 +0200 + + I18n: Update translation de (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 32734bb8bd19ee58a5c5a031451a6672c19c9a4a +Author: Anonymous +Date: Mon Oct 2 00:31:02 2017 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ab31b44c95321190bcab6f25b1e0a44dbd2340dd +Author: Anonymous +Date: Sat Sep 30 18:32:25 2017 +0200 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 495cbfcc05045f6cc8b860af3c8b94b68c4ac798 +Author: Anonymous +Date: Sat Sep 30 00:31:58 2017 +0200 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 214d83689b11f2b2fc70cc9a48dcfc729c7496ae +Author: Xfce Bot +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation ug (54%). + + 111 translated messages, 91 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6033330afaa8d334660aced984d9947c3c551c03 +Author: Theppitak Karoonboonyanan +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation th (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit eeefed618923c79764d84db9575f8073da05f501 +Author: Arve Eriksson <031299870@telia.com> +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation sv (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c96183b3c8327da183920212c8bb4fb07c8650be +Author: Саша Петровић +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation sr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8f3f33e3ccb5ec9d9c3b7995258e1904a3fc42e2 +Author: Anonymous +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation sl (97%). + + 196 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f90d3d4482413d1f0b8d35d2ce51e2b718cdcbe1 +Author: Anonymous +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation ru (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 32810417746e82a94754604ffc49068e95c86123 +Author: Nuno Miguel +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation pt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 0ca114a562d63094263c09bc2216524b78b7e3b4 +Author: Michael Martins +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation pt_BR (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 3374fc54b63bd25f5a4f2cdac432ce41fa64c594 +Author: m4sk1n +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation pl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1fb592f944cac113e570f7e5c7f8f9446e7b4cd6 +Author: Cédric Valmary +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation oc (79%). + + 160 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ae4c76c26443efa526b661f9691d19fe30ebb264 +Author: Pjotr +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation nl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6fc901fae0ca0d1d8c144c72ad7010e3430c3078 +Author: Sungjin Kang +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation ko (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9546ee63a87e76b8f4dbaf496cd0487e81e0c072 +Author: Baurzhan Muftakhidinov +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation kk (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a99e3d4117febb7fb4f320ffb971d1212765addd +Author: bebabi34 +Date: Sun Sep 24 00:37:24 2017 +0200 + + I18n: Update translation it (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7a42dedd6292f45f353f91d0c5fff01da6c1fc41 +Author: Kukuh Syafaat +Date: Sun Sep 24 00:37:23 2017 +0200 + + I18n: Update translation id (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9a91f7c17a680eff5ea05241f8a8a2714b6580fd +Author: gyeben +Date: Sun Sep 24 00:37:23 2017 +0200 + + I18n: Update translation hu (79%). + + 160 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 343d58159b8ebcd00263dec856c208fb0f668b06 +Author: Lovro Kudelić +Date: Sun Sep 24 00:37:23 2017 +0200 + + I18n: Update translation hr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit cd61d15deee40d5c5ab6943bb2b5b581351c4ae4 +Author: Elishai Eliyahu +Date: Sun Sep 24 00:37:22 2017 +0200 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 71244f26cbe214007d8f12b29c551a0294d607a7 +Author: Yannick Le Guen +Date: Sun Sep 24 00:37:22 2017 +0200 + + I18n: Update translation fr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2b41fca5045d566cc3a8bb620cd183e093a81deb +Author: Brian Peraza-Orozco +Date: Sun Sep 24 00:37:21 2017 +0200 + + I18n: Update translation es (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 25fe792c77d1d220352b37498a73e961a1ee5d0a +Author: Michael Findlay +Date: Sun Sep 24 00:37:21 2017 +0200 + + I18n: Update translation en_AU (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f6b716bc7c754a582cc88284bf2a2d981dfdc62a +Author: Xfce Bot +Date: Sun Sep 24 00:37:21 2017 +0200 + + I18n: Update translation ast (85%). + + 173 translated messages, 29 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 4625423363a6f742b33a50688818d40c20dcdbed +Author: Cheng-Chia Tseng +Date: Wed Sep 20 00:41:29 2017 +0200 + + I18n: Update translation zh_TW (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit deed09d988c3f02fe05d39b8eed7a7cba3971195 +Author: Xfce Bot +Date: Wed Sep 20 00:41:29 2017 +0200 + + I18n: Update translation zh_HK (55%). + + 113 translated messages, 89 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e411b991c07e2dd17f06bd8296060affedf2b167 +Author: Mingcong Bai +Date: Wed Sep 20 00:41:29 2017 +0200 + + I18n: Update translation zh_CN (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f2d94b4cd5af5cd1930cd5817b227ba6f1190c44 +Author: Xfce Bot +Date: Wed Sep 20 00:41:29 2017 +0200 + + I18n: Update translation vi (55%). + + 112 translated messages, 90 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 79bcb3e81b278708184a1a3c2527a197aa7bab83 +Author: Yarema aka Knedlyk +Date: Wed Sep 20 00:41:28 2017 +0200 + + I18n: Update translation uk (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7dfb5ff6951bb583c71f8c9f648b319c87eb00fe +Author: Xfce Bot +Date: Wed Sep 20 00:41:28 2017 +0200 + + I18n: Update translation ug (54%). + + 111 translated messages, 91 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5cd4b2071e44e0909aa8f100e190a907ad39a7f6 +Author: Necdet Yücel +Date: Wed Sep 20 00:41:28 2017 +0200 + + I18n: Update translation tr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a4f518b475fba46cac6d4897cb6f63d9bacc5fac +Author: Theppitak Karoonboonyanan +Date: Wed Sep 20 00:41:28 2017 +0200 + + I18n: Update translation th (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6e77a1e14fa9d6cb9166aa1ad3f7ff1a0bb98062 +Author: Arve Eriksson <031299870@telia.com> +Date: Wed Sep 20 00:41:28 2017 +0200 + + I18n: Update translation sv (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 982a1d7d8549caae597a95df2344fe3c10721172 +Author: Саша Петровић +Date: Wed Sep 20 00:41:27 2017 +0200 + + I18n: Update translation sr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit dc8e98416b1992039860990f48f7594d99bf51ee +Author: Anonymous +Date: Wed Sep 20 00:41:27 2017 +0200 + + I18n: Update translation sl (97%). + + 196 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7bbe7b3c8241275a635b9c85115f143ef3eb6fba +Author: Dušan Kazik +Date: Wed Sep 20 00:41:27 2017 +0200 + + I18n: Update translation sk (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 986949aa935dfdc0b0617709a9d8aa24bbccfcae +Author: Anonymous +Date: Wed Sep 20 00:41:27 2017 +0200 + + I18n: Update translation ru (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 09f74b0c6620257630064eb7b950475b225032f1 +Author: Xfce Bot +Date: Wed Sep 20 00:41:26 2017 +0200 + + I18n: Update translation ro (91%). + + 185 translated messages, 17 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 28af09ef8b313642bd76462287ac1b0abd56655c +Author: Nuno Miguel +Date: Wed Sep 20 00:41:26 2017 +0200 + + I18n: Update translation pt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f1ea88cdd5e4a689894a335eb4ff42784d64bc20 +Author: Michael Martins +Date: Wed Sep 20 00:41:26 2017 +0200 + + I18n: Update translation pt_BR (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 27d64f96982ae4b7451e54dccd052b357938ff5f +Author: m4sk1n +Date: Wed Sep 20 00:41:26 2017 +0200 + + I18n: Update translation pl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5c33b32cb2732a56d9e5732f4bd37e1a22157de7 +Author: Cédric Valmary +Date: Wed Sep 20 00:41:26 2017 +0200 + + I18n: Update translation oc (79%). + + 160 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8b8319234fba566ebcb41245fc61b0d6be7bff64 +Author: Kevin Brubeck Unhammer +Date: Wed Sep 20 00:41:26 2017 +0200 + + I18n: Update translation nn (88%). + + 179 translated messages, 23 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bcb30ff07c18f3b906a19b7bf3bf634b8d5a456d +Author: Pjotr +Date: Wed Sep 20 00:41:25 2017 +0200 + + I18n: Update translation nl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 34a5bca34b8841fe0590ddea3b1af7aadca62fa9 +Author: Allan Nordhøy +Date: Wed Sep 20 00:41:25 2017 +0200 + + I18n: Update translation nb (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bd8398e3a21e1890c9ec3a0b30125932f571f0b5 +Author: abuyop +Date: Wed Sep 20 00:41:25 2017 +0200 + + I18n: Update translation ms (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit dc69414a2b0debe76a4731beefc8b23effcd2a9a +Author: Anonymous +Date: Wed Sep 20 00:41:25 2017 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6fce7c3fc9afbc3b0225f5570126c446c51bebd4 +Author: Sungjin Kang +Date: Wed Sep 20 00:41:24 2017 +0200 + + I18n: Update translation ko (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 73ae73cea51ff34f28869f1f5bf41c3edad4f4a1 +Author: Baurzhan Muftakhidinov +Date: Wed Sep 20 00:41:24 2017 +0200 + + I18n: Update translation kk (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9544a5413f485e6c2af0a212c845f15842de0620 +Author: Nobuhiro Iwamatsu +Date: Wed Sep 20 00:41:24 2017 +0200 + + I18n: Update translation ja (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit a020031bee612ebd44385d99c687d66c73e9a430 +Author: bebabi34 +Date: Wed Sep 20 00:41:24 2017 +0200 + + I18n: Update translation it (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 29b002d424c33c6eb9f6e573965a2926dced67ef +Author: Anonymous +Date: Wed Sep 20 00:41:24 2017 +0200 + + I18n: Update translation is (90%). + + 182 translated messages, 20 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7589d79deee2d4fb4560e3a120b008fe9ecd233a +Author: Kukuh Syafaat +Date: Wed Sep 20 00:41:23 2017 +0200 + + I18n: Update translation id (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d27370dcfafd40ea1171cbd2ac9a41a4be5931fd +Author: gyeben +Date: Wed Sep 20 00:41:23 2017 +0200 + + I18n: Update translation hu (79%). + + 160 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit cf6ada8c8ac56bc9ac849c43927a3af4dc2a70b9 +Author: Lovro Kudelić +Date: Wed Sep 20 00:41:23 2017 +0200 + + I18n: Update translation hr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 107b663ad50704fbd8bbbb04b90af0be19ff5104 +Author: Elishai Eliyahu +Date: Wed Sep 20 00:41:23 2017 +0200 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f9de12a4210b9078745556412912e33323fb4aca +Author: Xfce Bot +Date: Wed Sep 20 00:41:23 2017 +0200 + + I18n: Update translation gl (70%). + + 143 translated messages, 59 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 9538d6f50623ee0974672586ef76051319376aff +Author: Yannick Le Guen +Date: Wed Sep 20 00:41:22 2017 +0200 + + I18n: Update translation fr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6d9e2aea79229762f463911e14ec4c4801d9f086 +Author: Pasi Lallinaho +Date: Wed Sep 20 00:41:22 2017 +0200 + + I18n: Update translation fi (98%). + + 198 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit aa48baf17904e43c158b4931a304130fc0a58dcc +Author: Xfce Bot +Date: Wed Sep 20 00:41:22 2017 +0200 + + I18n: Update translation eu (54%). + + 110 translated messages, 92 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 67574299c2f9bfb24e83543709cb86646d3e53f7 +Author: Brian Peraza-Orozco +Date: Wed Sep 20 00:41:21 2017 +0200 + + I18n: Update translation es (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6d1f4f6e215197da3ec2a32aa68946822ce20de6 +Author: Xfce Bot +Date: Wed Sep 20 00:41:21 2017 +0200 + + I18n: Update translation en_GB (54%). + + 111 translated messages, 91 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c1d590fa585851e4bb0d8fdca48d5f3e654251b7 +Author: Michael Findlay +Date: Wed Sep 20 00:41:21 2017 +0200 + + I18n: Update translation en_AU (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 62b138de02e4f5fec7b66f18cd0c1cd7dcb926f7 +Author: Apóstolos Papaðimitríu +Date: Wed Sep 20 00:41:21 2017 +0200 + + I18n: Update translation el (97%). + + 197 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8e722982feac35aefdd108dc13316f401cad7569 +Author: Tobias Bannert +Date: Wed Sep 20 00:41:21 2017 +0200 + + I18n: Update translation de (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5461d95904e6f277e323e103101f2ceffe81e7de +Author: Anonymous +Date: Wed Sep 20 00:41:20 2017 +0200 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 8c379f35a7613793026bbfb2fec936985821a7f0 +Author: Petr Šimáček +Date: Wed Sep 20 00:41:20 2017 +0200 + + I18n: Update translation cs (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit f133fff2bbc0f4a385a95d3aabfa992886c864d6 +Author: Robert Antoni Buj Gelonch +Date: Wed Sep 20 00:41:20 2017 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 169fc29e2fbbb1cedc2b8a3304ace09df1995907 +Author: Kiril Kirilov +Date: Wed Sep 20 00:41:20 2017 +0200 + + I18n: Update translation bg (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 364aab14e8dfd0275543fac07be9c7eb0a176710 +Author: Xfce Bot +Date: Wed Sep 20 00:41:19 2017 +0200 + + I18n: Update translation ast (85%). + + 173 translated messages, 29 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit dc1fb03161a91a386f30b1e856c859a8dad1894f +Author: Anonymous +Date: Wed Sep 20 00:41:19 2017 +0200 + + I18n: Update translation ar (89%). + + 180 translated messages, 22 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7f8d88da645972599e2dc76c6522c605d8ecec2f +Author: Anonymous +Date: Thu Sep 14 00:32:09 2017 +0200 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 557e6d92f08c41fb9150e34b138df7a3b97e6bf6 +Author: Anonymous +Date: Wed Sep 13 18:32:31 2017 +0200 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 56cbd944084a85ce6de5590e4b7008f967f7d7df +Author: Anonymous +Date: Mon Sep 11 06:30:58 2017 +0200 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e655ed0051505210f65c280e071aee6822b91754 +Author: Michael Martins +Date: Tue Aug 29 06:32:53 2017 +0200 + + I18n: Update translation pt_BR (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 23fc649fa132e0f6e0712f1432d0d2c8fec269b2 +Author: Anonymous +Date: Mon Jul 10 00:30:53 2017 +0200 + + I18n: Update translation ar (89%). + + 180 translated messages, 22 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 6d02bbc1515e3f70539878a33ad6fc572e315409 +Author: Anonymous +Date: Sun Jul 9 18:30:59 2017 +0200 + + I18n: Update translation ar (82%). + + 166 translated messages, 36 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 1d6f4be2dca279ef95168eeb80d2b340b362cfea +Author: Anonymous +Date: Fri Jul 7 06:30:52 2017 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c4549775938f0455be1f90774d11bbc4f1f83446 +Author: Anonymous +Date: Fri Jul 7 00:30:40 2017 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 17909b06c4fdd7bdc434871bbab297ef5dc01154 +Author: Anonymous +Date: Wed Jul 5 12:30:45 2017 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit e7f50112cd2bed709bebc37ecff61a349a819e98 +Author: Pjotr +Date: Tue Jul 4 12:35:33 2017 +0200 + + I18n: Update translation nl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit cb2160bf853f2239c0ad4cfbd7c30757a2bfa6a5 +Author: Anonymous +Date: Sun Jun 18 06:31:29 2017 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a8f3ddb30dbf98f9839467fc48d8390b3782a4a2 +Author: Pjotr +Date: Sat Jun 10 15:03:48 2017 +0200 + + I18n: Update translation nl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 755a51529c72afd6f7781f24edabbecb7f124489 +Author: Baurzhan Muftakhidinov +Date: Sun Apr 16 00:30:41 2017 +0200 + + I18n: Update translation kk (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1c8f45a5cb9600c9a59a5f4b84f813f0f9093b6c +Author: Arve Eriksson <031299870@telia.com> +Date: Wed Apr 12 12:30:40 2017 +0200 + + I18n: Update translation sv (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4dd11420c79b890410034118534eab1ebeb1a958 +Author: Kevin Brubeck Unhammer +Date: Mon Mar 13 12:30:55 2017 +0100 + + I18n: Update translation nn (88%). + + 179 translated messages, 23 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4ac48ae53d94fa308c406ab7cc24df11edb27366 +Author: Kevin Brubeck Unhammer +Date: Mon Mar 13 00:30:36 2017 +0100 + + I18n: Update translation nn (78%). + + 159 translated messages, 43 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5cdf473b600556a3a3fa701588c8b8105e2a7652 +Author: Kevin Brubeck Unhammer +Date: Sun Mar 12 12:30:35 2017 +0100 + + I18n: Update translation nn (76%). + + 154 translated messages, 48 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e8adcf05b49b751a883d6f4551243dc9f0eee544 +Author: Apóstolos Papaðimitríu +Date: Sun Mar 12 00:30:35 2017 +0100 + + I18n: Update translation el (97%). + + 197 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ea822770a8e80a2d62d6772d24bf42e867779e5d +Author: Cheng-Chia Tseng +Date: Wed Mar 8 18:30:54 2017 +0100 + + I18n: Update translation zh_TW (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d51a403ed943c43792011bd2494b9992cf7f08a2 +Author: Pjotr +Date: Sat Mar 4 12:30:54 2017 +0100 + + I18n: Update translation nl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cc792ec38a2652e50688573609293698fe4caa3f +Author: Apóstolos Papaðimitríu +Date: Sat Mar 4 00:31:01 2017 +0100 + + I18n: Update translation el (96%). + + 195 translated messages, 7 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f00abc6355541c985bb56e87acc15bd39f9c731c +Author: Pjotr +Date: Fri Mar 3 12:30:35 2017 +0100 + + I18n: Update translation nl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 145db0e4c5387d872cdce5168f2a4d760fb1722c +Author: Kukuh Syafaat +Date: Sun Feb 26 12:30:36 2017 +0100 + + I18n: Update translation id (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bc475a6177e29dc3af7daa16a2eb65951e5fd34d +Author: Саша Петровић +Date: Fri Feb 24 00:30:40 2017 +0100 + + I18n: Update translation sr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ca0a01cd8976efb798c2db1185971e55de2de0e9 +Author: Robert Antoni Buj Gelonch +Date: Sun Feb 19 00:30:36 2017 +0100 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 65f0bb29cfa1830019b280c47713c3aaed4bca0a +Author: Robert Antoni Buj Gelonch +Date: Sat Feb 18 18:30:35 2017 +0100 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8e87f32ec2597eabe50fd224946a47dab637063f +Author: Robert Antoni Buj Gelonch +Date: Tue Feb 14 18:30:59 2017 +0100 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a8b5f9115c93b5df0a5bc14e16c073655eb886bb +Author: Robert Antoni Buj Gelonch +Date: Fri Feb 10 12:30:51 2017 +0100 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 740f3735f83e46cd9c6ec081ab492637c4baed49 +Author: Pasi Lallinaho +Date: Thu Feb 2 18:30:58 2017 +0100 + + I18n: Update translation fi (98%). + + 198 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 568628306a418ccd166ca4271d4eacb7ddae13fb +Author: Anonymous +Date: Mon Jan 23 00:31:19 2017 +0100 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ce064b3d16bdbc0b247868a621d2c03b11f231be +Author: Anonymous +Date: Sun Jan 22 00:31:37 2017 +0100 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8047e2192966bc31b9d85becfca8f13767cdde3a +Author: Anonymous +Date: Mon Jan 16 18:31:29 2017 +0100 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 382a75ced5eca01cb60267bc16a035f1533bc156 +Author: Allan Nordhøy +Date: Mon Dec 12 18:30:42 2016 +0100 + + I18n: Update translation nb (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1cc34cd643ea64c92a53c6efe602c1e122da2888 +Author: Anonymous +Date: Fri Dec 9 06:30:59 2016 +0100 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9ba512f12ea6f5e4924450137963daff71abb99b +Author: Marcin +Date: Sat Dec 3 12:30:35 2016 +0100 + + I18n: Update translation pl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fd9d38b90ebdb1e4061b44389fbccc331ebc21a6 +Author: Anonymous +Date: Sun Nov 6 00:30:35 2016 +0100 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 176fbd3acf60382b9a79fc44dadd6e39224343d9 +Author: Baurzhan Muftakhidinov +Date: Fri Nov 4 12:30:37 2016 +0100 + + I18n: Update translation kk (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0cc00b38fc056e319df3d19af482d325a0a27508 +Author: Anonymous +Date: Wed Oct 12 00:30:36 2016 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 02c74c74993001ccb4d721b9acf2e1830d66067e +Author: Kamil \"elder\" P +Date: Thu Sep 22 18:30:42 2016 +0200 + + I18n: Update translation pl (98%). + + 199 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1d38248dce89d00bc8b95c2d24e4e1746c57c542 +Author: Anonymous +Date: Sat Sep 17 00:30:44 2016 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e49282932b20451834ae9d558aaa8d7b245f6fd7 +Author: Anonymous +Date: Wed Sep 14 12:30:36 2016 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit eb7f386d2bdd658ffe369f46b1bce2321c93991b +Author: Marcin XD +Date: Thu Sep 8 00:30:51 2016 +0200 + + I18n: Update translation pl (98%). + + 198 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9daecb5a1763035db6adc83f45a7a01349872f53 +Author: Baurzhan Muftakhidinov +Date: Sun Sep 4 18:30:59 2016 +0200 + + I18n: Update translation kk (98%). + + 199 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c7d49a1083773721b4934651c78937c52bc53fb1 +Author: Robert Antoni Buj Gelonch +Date: Tue Aug 23 12:30:36 2016 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 57b7ab027ea0e5b85598b923b0c32d95ccabf06b +Author: Theppitak Karoonboonyanan +Date: Sat Aug 20 12:30:36 2016 +0200 + + I18n: Update translation th (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit dd4d694c52a4e74d82a6d75311414e1882c9d4c4 +Author: Lovro Kudelić +Date: Tue Aug 9 12:31:06 2016 +0200 + + I18n: Update translation hr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3343f5539e8f5b93172cfde1f55d0ad5d703e010 +Author: Anonymous +Date: Tue Jul 12 18:30:54 2016 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 07da3d20e8918939377eb92f17a8ef5791a8c49e +Author: Anonymous +Date: Sat Jul 2 00:30:48 2016 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2d5721ba849c5e5a113813174eefcf94dd71df7a +Author: Cédric Valmary +Date: Sat Jun 11 18:30:35 2016 +0200 + + I18n: Update translation oc (79%). + + 160 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 583be76e656539ac8c2a1d122b37eac2df30ed93 +Author: Piotr Strębski +Date: Fri Jun 10 00:30:40 2016 +0200 + + I18n: Update translation pl (98%). + + 198 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7e8574c188893eb2a73cf9d51765822089010dd5 +Author: Eric Koegel +Date: Sun Jun 5 16:10:46 2016 +0300 + + When locking fallback to xflock4 first (Bug #12603) + + While it would be nice to use the xdg-screensaver first since it + is the standard, it breaks the existing workflow for users who + have custom patches in xflock4 so switch back to the previous + fallback order. + +commit 24bcf752e51c2762d40a7611caff399c2f0556aa +Author: Eric Koegel +Date: Sat Jun 4 17:44:10 2016 +0300 + + Fix a crash when warning about the screenlocker (Bug #12603) + +commit 94c5b1ff5359549c54478668cafb1d03c8162ae8 +Author: Nuno Miguel +Date: Tue May 31 18:30:34 2016 +0200 + + I18n: Update translation pt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 77fa8e5f7d6c90a7b96b466b654da5aff456816e +Author: Eric Koegel +Date: Tue May 31 10:21:10 2016 +0300 + + Fix showing inhibits in the systray (Bug #12605) + + The systray apparently can't use the dbus inhibt interface at all, + so use a direct call to get the list of inhibitors to display in + the menu. + +commit f61346aa3a74998fe2632ffa7c7f5a45d58c951d +Author: Eric Koegel +Date: Tue May 31 11:33:51 2016 +0300 + + Fix the g_object_bindings in xfce-screensaver + + They were put in the init function which causes them to overwrite + what's already present. Have them bind after the object has been + fully created. + +commit 9e70d2e4aa8b9287a4d06d35010a01ba3bebd857 +Author: Eric Koegel +Date: Fri May 27 15:45:13 2016 +0300 + + Handle screensaver activity with it's own class (Bug #12603) + + Move the screensaver inhibit, heartbeat, and lock code to its own + set of files we can easily share with xfce4-session. Use the + screensaver's dbus API if it supports it for inhibit and lock + calls. Otherwise, use the heartbeat-command and LockCommand + from xfpm and xfsm if available. Finally, for the lock function, + fallback to trying xdg-screensaver, xflock4, and xscreensaver-command + in that order. + +commit 61abc7354c842b577304475c4b2cc6bf12db88a5 +Author: Tobias Bannert +Date: Thu May 26 18:30:33 2016 +0200 + + I18n: Update translation de (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e119180e74f2640e814a9499e1b34b66bdd5da06 +Author: Eric Koegel +Date: Tue May 24 16:29:31 2016 +0300 + + Fixup the 3.20 deprecation warnings + +commit 92189ef3ac1ff909591a4662d520f28f672793a0 +Author: Eric Koegel +Date: Tue May 24 15:31:56 2016 +0300 + + Load the inhibit proxy interface in an async callback + + Otherwise we may end up waiting for another part of xfpm that + hasn't loaded yet. + +commit 36b2c96e91feeb118a4e8170c5d608795f00d5f2 +Author: Eric Koegel +Date: Tue May 24 14:55:52 2016 +0300 + + Use the kernel-supplied backlight type rather than a whitelist (Bug #12553) + + This is a patch to replace the list of interfaces in + backlight_helper_get_best_backlight() with the same logic as here: + https://git.gnome.org/browse/gnome-settings-daemon/tree/plugins/power/gsd-backlight-linux.c#n61 + + i.e. grab the first interface of type "firmware" and fall back on the first + interface of type "platform" and finally "raw". + + Here's the commit that replaced the list of interfaces in the GNOME source, + and the rationale: + https://git.gnome.org/browse/gnome-settings-daemon/commit/plugins/power/gsd-backlight-helper.c?id=fff09fe17eecb9314962d119a5c5b4e865f2570d + + Patch by Jack Bates + +commit 50eb18ffdea1b4992ecea4d0e04729db6142203b +Author: Robert Antoni Buj i Gelonch +Date: Tue May 3 18:30:48 2016 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 60308e6cb9e5cc39c8519b66a37e39e840cf1107 +Author: Robert Antoni Buj i Gelonch +Date: Tue May 3 00:30:51 2016 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3834e909284253d1970aee4adfff8c2a29c8b5de +Author: Robert Antoni Buj i Gelonch +Date: Mon May 2 18:31:12 2016 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5ebcdb3af1786a3d76dc2ad63d1f400ee93489b0 +Author: Robert Antoni Buj i Gelonch +Date: Mon May 2 00:31:29 2016 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fe265c9a355cd9bfde085cfc3f79f46f9c681af7 +Author: Robert Antoni Buj i Gelonch +Date: Sun May 1 12:31:24 2016 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d1591c1977af10a85ab189baf59689d033ceb745 +Author: Robert Antoni Buj i Gelonch +Date: Sun May 1 00:30:33 2016 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f3f039eec666e9e30681cc0492a4b9818abc57b5 +Author: Anonymous +Date: Sat Apr 30 00:31:23 2016 +0200 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b3740b5da4c4f958531d06cc2ef44aff86eddad1 +Author: bebabi34 +Date: Sat Apr 16 18:30:33 2016 +0200 + + I18n: Update translation it (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 24f944a29aebc1a1bb99595da5a45d4ed65365cc +Author: André Miranda +Date: Sat Apr 9 00:30:33 2016 +0200 + + I18n: Update translation pt_BR (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 975b29f9d6b41b940d9e9006f05bb6e652ed0211 +Author: Davidmp +Date: Fri Apr 8 18:30:32 2016 +0200 + + I18n: Update translation ca (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e34d683ff26912df28a7d1adfb933dff877ffb7b +Author: gyeben +Date: Tue Mar 29 18:31:19 2016 +0200 + + I18n: Update translation hu (79%). + + 160 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 87ee0a5e0957990acebafe534348df7ac5ad4ef3 +Author: Elishai Eliyahu +Date: Mon Mar 21 18:31:43 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 945f46935cf53a0e641de965515f808730fe4a75 +Author: Elishai Eliyahu +Date: Mon Mar 21 12:30:32 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e45ea92011b2ee56e4d370adb8014154e829e32b +Author: GenghisKhan +Date: Sun Mar 20 18:30:54 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9d019a70a564c82006398ebddaf0f564edf7c14d +Author: Cédric Valmary +Date: Fri Mar 18 18:30:56 2016 +0100 + + I18n: Update translation oc (64%). + + 131 translated messages, 71 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0f07f131d4ee7a97111bf36cccd40155ee150278 +Author: Eric Koegel +Date: Fri Mar 18 18:36:05 2016 +0300 + + trivial: remove unused variables + +commit 1fde059328e81fee1ec3b3a8f966302d2547fe5d +Author: Eric Koegel +Date: Fri Mar 18 18:30:22 2016 +0300 + + Add the git suffix back in + +commit 15d63ccd6023d6427966481f88b69f674fb1b107 +Author: Anonymous +Date: Fri Mar 18 00:31:41 2016 +0100 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bd40ec1fa381df94d46fdc4b5cf8632ed30b24c9 +Author: Simon Steinbeiss +Date: Thu Mar 17 21:16:19 2016 +0100 + + Add MATE to NotShowIn list (Bug #12506) + +commit 40c62d2a45501665e8e7e8c294a0c8d560f935ca +Author: GenghisKhan +Date: Thu Mar 17 00:30:56 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bb3b1190026d68ddb907a000531007e1dbe0d224 +Author: GenghisKhan +Date: Wed Mar 16 18:31:26 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ddf87694fda4bc49abb88138b46f96a4f510e211 +Author: Antonio Peraza-Orozco +Date: Wed Mar 16 00:30:32 2016 +0100 + + I18n: Update translation es (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6c70dd333f0f78d596c41e0a8e0e82f90957e8c6 +Author: GenghisKhan +Date: Tue Mar 15 18:31:41 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8032ea6a790a9029c48402ea6fe9de0a229c998a +Author: Eric Koegel +Date: Sun Mar 13 09:50:13 2016 +0300 + + Updates for release. + +commit f5d9017e1c3a648d2b8bf5a2ca6b67b3152f2fd5 +Author: Aputsiaĸ Niels Janussen +Date: Sat Mar 12 18:30:32 2016 +0100 + + I18n: Update translation da (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c4d403ea8bcf9a46e3c15d58f9e4715e001927a2 +Author: Cédric Valmary +Date: Fri Mar 11 18:31:53 2016 +0100 + + I18n: Update translation oc (62%). + + 127 translated messages, 75 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2b321eb646c4759dbcff662d8950cc73bb198f12 +Author: GenghisKhan +Date: Fri Mar 11 18:31:53 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4f778789b6796272f1095556a21f0625642d366b +Author: abuyop +Date: Fri Mar 11 12:31:43 2016 +0100 + + I18n: Update translation ms (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 580ef9fc72c3c380270106f63ed369659f62105b +Author: GenghisKhan +Date: Wed Mar 9 18:30:57 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5fb47ad2d5caa250a3a6be646d8d7ebe4ac27db5 +Author: GenghisKhan +Date: Tue Mar 8 12:30:46 2016 +0100 + + I18n: Update translation he (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8edbf080ff7a1d27075465890b482b8b3318e82d +Author: Yarema aka Knedlyk +Date: Tue Mar 8 06:30:33 2016 +0100 + + I18n: Update translation uk (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a8bd15aa26dc7c492cf96eb9c89dfc8205928aef +Author: Michael Findlay +Date: Mon Mar 7 06:31:03 2016 +0100 + + I18n: Update translation en_AU (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 20be43db3015ae00023e5451af5e17aca759061d +Author: 白铭骢 +Date: Sun Mar 6 18:31:22 2016 +0100 + + I18n: Update translation zh_CN (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9a2fcecdb2e9190156d5470968aa3e221a7b19f4 +Author: Pjotr +Date: Sun Mar 6 18:31:22 2016 +0100 + + I18n: Update translation nl (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9780523f0d0a15327a1f78ce3daf31a5203e17fc +Author: Necdet Yücel +Date: Fri Mar 4 12:30:32 2016 +0100 + + I18n: Update translation tr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4fa241384ee0db73bad2dbe27d8bb02076f7b2d4 +Author: Nobuhiro Iwamatsu +Date: Fri Mar 4 06:30:37 2016 +0100 + + I18n: Update translation ja (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ddc6be7eaec1b9d02ef3fe79ef939d8f36b5344f +Author: Anonymous +Date: Fri Mar 4 00:30:57 2016 +0100 + + I18n: Update translation is (90%). + + 182 translated messages, 20 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ba1588e1ed7bde9d77e97a28a23465777214c63c +Author: Påvel Nicklasson +Date: Wed Mar 2 12:30:32 2016 +0100 + + I18n: Update translation sv (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c627cf27d715f597af6cb56e69dca32cf8e20a38 +Author: Anonymous +Date: Wed Mar 2 00:31:24 2016 +0100 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d040e7146a9f5767438e6656dacbebf671fde866 +Author: Petr Šimáček +Date: Wed Mar 2 00:31:23 2016 +0100 + + I18n: Update translation cs (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 34ace6223948bed4c2ab928be2e9c376fa713156 +Author: Anonymous +Date: Tue Mar 1 00:30:46 2016 +0100 + + I18n: Update translation sl (97%). + + 196 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit aceec983ebc1c39b928d5ffd1001877f6645fe94 +Author: Jeff Huang +Date: Sun Feb 28 18:30:32 2016 +0100 + + I18n: Update translation zh_TW (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 075477951501ddffa45ce900e68ceae6a01720f3 +Author: AlexanderFilev +Date: Sun Feb 28 00:30:33 2016 +0100 + + I18n: Update translation ru (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 220b3566684f852bd1e070d1698f1f927e8903eb +Author: Anonymous +Date: Sun Feb 28 00:30:33 2016 +0100 + + I18n: Update translation lt (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit aabbb223c00b1ec05bea451722223327e36ff8ec +Author: Sungjin Kang +Date: Sat Feb 27 18:30:33 2016 +0100 + + I18n: Update translation ko (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c3abb9d7bbe2bac8e152150adbb9814a3e59fc38 +Author: Yannick Le Guen +Date: Sat Feb 27 18:30:33 2016 +0100 + + I18n: Update translation fr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3744a5f11c66aca5601b5b413a0db20635fc5eb5 +Author: Xfce Bot +Date: Sat Feb 27 12:30:33 2016 +0100 + + I18n: Update translation is (89%). + + 181 translated messages, 21 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fc1122630e9a66341e0bc1069b8327d683f9adf4 +Author: Yannick Le Guen +Date: Sat Feb 27 12:30:33 2016 +0100 + + I18n: Update translation fr (100%). + + 202 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 292d4c90535d54647c8759476d791fab4977ff41 +Author: Eric Koegel +Date: Fri Feb 26 18:53:15 2016 +0300 + + Show inhibitors in the plugin menu (Bug #9090) + + This patch now displays the applications that are inhibiting xfpm + from doing power management in the plugin/systray menu. + +commit 7b1e006c8eaebf16a449b890416f3fea927f6d48 +Author: Eric Koegel +Date: Thu Feb 25 19:40:49 2016 +0300 + + Fix a crash on logout (Bug #12465) + + During session shutdown we were in a situation with a NULL model + which was crashing a crash. Set these to an empty string so xfpm + properly handles it. + Reported and fixed by Jaroslav Škarvada. + + Signed-off-by: Eric Koegel + +commit ebd7acd07b52129bafce0fee4babfe3caa2debfd +Author: Lasse Liehu +Date: Wed Feb 17 00:30:44 2016 +0100 + + I18n: Update translation fi (98%). + + 197 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d0ea6d9202b0433f562ac30ad53d1f9480f51895 +Author: Eric Koegel +Date: Mon Feb 15 20:11:12 2016 +0300 + + Replace XTestFakeKeyEvent with inhibit/heartbeat (Bug #11083) + + Instead of using XTestFakeKeyEvent, attempt to contact whatever + screensaver is running via its dbus interface. Failing that, + a /xfce4-power-manager/heartbeat-command xfconf property will be + executed every 30 seconds to keep the screensaver from + launching. This way xscreensaver, xdg-screensaver, caffeine or + a similar tool can be used. + +commit d7141f3eb9a3b72e13e122fd372d28630d4efbb0 +Author: Apostolos Papadimitriu +Date: Fri Feb 12 00:30:41 2016 +0100 + + I18n: Update translation el (96%). + + 194 translated messages, 7 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit df89b41bdb88cf9554ea91256789b07adc9344fb +Author: Apostolos Papadimitriu +Date: Wed Feb 10 00:30:49 2016 +0100 + + I18n: Update translation el (96%). + + 193 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7b143a210a60f09fa85d10b79ba152b8c8f46d87 +Author: Apostolos Papadimitriu +Date: Tue Feb 9 00:30:50 2016 +0100 + + I18n: Update translation el (96%). + + 193 translated messages, 8 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c21f726c2aab6f03cc1abf8c70e9ea7694a2af8e +Author: Apostolos Papadimitriu +Date: Sat Feb 6 18:30:47 2016 +0100 + + I18n: Update translation el (95%). + + 192 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e24d57a0f114e5bd0d5770ffdab1dc81e975c1fe +Author: Påvel Nicklasson +Date: Fri Feb 5 00:30:52 2016 +0100 + + I18n: Update translation sv (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 337f4e8d9dcedbf9f3db2cb8a52ef4b548eb6868 +Author: Apostolos Papadimitriu +Date: Fri Feb 5 00:30:52 2016 +0100 + + I18n: Update translation el (86%). + + 173 translated messages, 28 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2e7d2b3fa8c91572432e0974ca3dab055f9fa00f +Author: Apostolos Papadimitriu +Date: Thu Feb 4 06:30:41 2016 +0100 + + I18n: Update translation el (77%). + + 156 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 03122f5e3e72c860d1b316802b2be1e82639813d +Author: Apostolos Papadimitriu +Date: Thu Feb 4 00:30:51 2016 +0100 + + I18n: Update translation el (76%). + + 154 translated messages, 47 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 32607e205100f73591b6a7abd497274653f1500a +Author: Elishai Eliyahu +Date: Tue Feb 2 18:30:39 2016 +0100 + + I18n: Update translation he (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit dbeae2d426cc4ef2eba5ca5722f21e2781094fa9 +Author: Elishai Eliyahu +Date: Wed Jan 27 18:30:43 2016 +0100 + + I18n: Update translation he (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7f294512f4e6dc32951bb36d06492adacc4a031a +Author: Martin Natano +Date: Mon Jan 25 21:58:16 2016 +0100 + + Add bitrig to backend detection (Bug #12242) + +commit 35d1f2b25293f446361603dfe9b4a21c7594b9a5 +Author: Simon Steinbeiss +Date: Sun Jan 24 16:03:56 2016 +0100 + + Draw border around device details + +commit 2ff69c8475cfb4b121ba107c41249a63aa8dffb2 +Author: Simon Steinbeiss +Date: Sat Jan 23 12:41:43 2016 +0100 + + Fix keyboard-brightness icon names (Bug #12292) + + Patch by Laurentiu Pancescu + +commit 83f002a0109f3752f033ab90ec73d13ca37b7b29 +Author: Ali Abdallah +Date: Sun Jan 17 09:56:28 2016 +0100 + + Fix a crash when the brightness slider is released + +commit 841b8e82d9cc9506832006e084c4fef265a1587f +Author: GenghisKhan +Date: Sat Jan 16 18:31:16 2016 +0100 + + I18n: Update translation he (97%). + + 195 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 462a594cdcdae49cfe0e1436f032b5ff996ce99f +Author: GenghisKhan +Date: Sat Jan 16 00:31:09 2016 +0100 + + I18n: Update translation he (97%). + + 195 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d722b4f9e2c980191fedebfa72bc1c362760756d +Author: Anonymous +Date: Wed Jan 13 06:31:20 2016 +0100 + + I18n: Update translation lt (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3eebaec97a1dc07e14d6050274dc594014d6b182 +Author: Anonymous +Date: Wed Jan 13 00:31:00 2016 +0100 + + I18n: Update translation lt (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 54dddf1e613847665720d9cef2833cdfbfb1a277 +Author: Påvel Nicklasson +Date: Mon Jan 11 12:30:42 2016 +0100 + + I18n: Update translation sv (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6eaf8f868ed9ed8018385e16a92eaacef3c32a9d +Author: Eric Koegel +Date: Mon Dec 28 16:12:00 2015 +0300 + + plugin: Fix a couple memory leaks (Bug #12332) + + Found a couple spots where we inadvertently leak memory. + + Signed-off-by: Eric Koegel + +commit 1f6b9b195aeb945af37ec5332bfc89f90a850f4b +Author: Sveinn í Felli +Date: Mon Dec 28 12:30:39 2015 +0100 + + I18n: Update translation is (88%). + + 178 translated messages, 23 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 339cebba4049c80be7f54d14413508f0923efe59 +Author: Davidmp +Date: Thu Dec 24 00:30:30 2015 +0100 + + I18n: Update translation ca (97%). + + 195 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8d2f092c9f012be18f34e7b52706381738fbe873 +Author: Davidmp +Date: Mon Dec 14 18:30:44 2015 +0100 + + I18n: Update translation ca (96%). + + 194 translated messages, 7 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2366e8815daf91794092645ca04a53fa9b310dea +Author: Sveinn í Felli +Date: Mon Dec 14 00:30:30 2015 +0100 + + I18n: Update translation is (88%). + + 178 translated messages, 23 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 10acd7b07806046afc1ae60f3f1ab980c46f7636 +Author: Kristján Magnússon +Date: Sun Dec 13 12:31:07 2015 +0100 + + I18n: Update translation is (65%). + + 131 translated messages, 70 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 77fb986b20afe53f27802978a9e2f904165f21c3 +Author: Kristján Magnússon +Date: Fri Dec 11 18:31:25 2015 +0100 + + I18n: Update translation is (65%). + + 131 translated messages, 70 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 28d0cda0033823a38f5c0c321eb333fb559d7057 +Author: Davidmp +Date: Fri Dec 11 00:30:30 2015 +0100 + + I18n: Update translation ca (91%). + + 184 translated messages, 17 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c1e574ee05246e49aa6e506b3aa05d38e43572b6 +Author: Davidmp +Date: Thu Dec 10 18:30:47 2015 +0100 + + I18n: Update translation ca (89%). + + 179 translated messages, 22 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1f2605bc4206d91972fe8a0a17251040ded58b6f +Author: Davidmp +Date: Thu Dec 10 00:30:57 2015 +0100 + + I18n: Update translation ca (68%). + + 137 translated messages, 64 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3d537efcaec022dbe637aa1bcf25df00fb5d1247 +Author: Ivica Kolić +Date: Fri Dec 4 12:30:53 2015 +0100 + + I18n: Update translation hr (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0b203713b7ba2aa333dd59adf886cf84b1d6b1b5 +Author: Xfce Bot +Date: Fri Nov 27 00:31:08 2015 +0100 + + I18n: Update translation ca (61%). + + 123 translated messages, 78 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 836a3ec7fce44b077008bcae558895078e267c67 +Author: Xfce Bot +Date: Mon Nov 23 18:30:54 2015 +0100 + + I18n: Update translation ca (60%). + + 122 translated messages, 79 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4410237266384c8a1efb72de6f2af03b5aa26374 +Author: Xfce Bot +Date: Sun Nov 22 18:30:46 2015 +0100 + + I18n: Update translation eu (54%). + + 110 translated messages, 91 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8a97f462ff890933ca9985326cd4811a772063c0 +Author: Kristján Magnússon +Date: Sun Nov 22 12:30:30 2015 +0100 + + I18n: Update translation is (64%). + + 129 translated messages, 72 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bc93d5a9d8c84d0920efddaddcad65f9088a874f +Author: Xfce Bot +Date: Tue Nov 17 12:30:43 2015 +0100 + + I18n: Update translation ca (60%). + + 121 translated messages, 80 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 38051025d872763dee7b1992194525797b1ab115 +Author: Anonymous +Date: Mon Nov 16 00:30:45 2015 +0100 + + I18n: Update translation lt (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4ed7c498b378c6c7505fa46b3fd91bb6715537db +Author: Morten Juhl-Johansen Zölde-Fejér +Date: Tue Nov 10 00:30:52 2015 +0100 + + I18n: Update translation da (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a39b8e43af097e0e60c7ce9db3fffdfa895b954a +Author: Xfce Bot +Date: Sat Nov 7 18:31:01 2015 +0100 + + I18n: Update translation oc (55%). + + 112 translated messages, 89 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 93d6a2990f921478913e80be575e6da6d1cd3ec6 +Author: Cristian Marchi +Date: Sun Nov 1 12:30:48 2015 +0100 + + I18n: Update translation it (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bdf8e6df0104e3393db9ea6c6281f625bf880c26 +Author: Nuno Miguel +Date: Sat Oct 31 18:30:55 2015 +0100 + + I18n: Update translation pt (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a550140aea8e95be01ace9d8ad6d653a929b0d52 +Author: Dušan Kazik +Date: Fri Oct 30 12:31:12 2015 +0100 + + I18n: Update translation sk (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e6a141d7e2928cb1db66eae00b556a1e4e634acb +Author: Dušan Kazik +Date: Wed Oct 28 00:30:48 2015 +0100 + + I18n: Update translation sk (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 752f7f1e1565ef27f3295036d508b0cd9876558e +Author: Yury Bulka +Date: Mon Oct 26 12:32:19 2015 +0100 + + I18n: Update translation uk (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 24a808d82fcf46b1e26203c1b4b6d208a8ea326c +Author: Dušan Kazik +Date: Sun Oct 25 12:30:31 2015 +0100 + + I18n: Update translation sk (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 360183284e524c494ae044ca7aa0c5e89c2e54b3 +Author: Dušan Kazik +Date: Thu Oct 22 12:30:57 2015 +0200 + + I18n: Update translation sk (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 11f8c254ac020406f856f3623f116e65abe03013 +Author: Xfce Bot +Date: Tue Oct 20 18:30:44 2015 +0200 + + I18n: Update translation is (57%). + + 116 translated messages, 85 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e3bda03800096f7ec110c49f7467586d96f03402 +Author: Anonymous +Date: Thu Oct 1 00:31:01 2015 +0200 + + I18n: Update translation lt (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 829095443b51f9a696fd5762ff4e4a0ff756dc8d +Author: Pasi Lallinaho +Date: Mon Sep 28 00:30:59 2015 +0200 + + I18n: Update translation fi (98%). + + 197 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2b22c0fbc4d8218f12e2eabc686468d45a41a060 +Author: Xosé +Date: Tue Sep 22 00:30:43 2015 +0200 + + I18n: Update translation gl (71%). + + 143 translated messages, 58 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 58f94e69a1ae2f4331ea5c8668724399160f99d5 +Author: Påvel Nicklasson +Date: Mon Sep 21 00:30:44 2015 +0200 + + I18n: Update translation sv (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f7e109c5456190a0e42937b6b409fdc3d898187a +Author: Xosé +Date: Sat Sep 19 00:31:30 2015 +0200 + + I18n: Update translation gl (65%). + + 131 translated messages, 70 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit acd3d2aaf5be9eee89dbe9f8aa4fae30f85d0535 +Author: Piotr Strębski +Date: Thu Sep 17 12:30:32 2015 +0200 + + I18n: Update translation pl (98%). + + 197 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b3c6c8f8dc5682802a461407becde9fb681622e2 +Author: Michael Findlay +Date: Sat Sep 12 12:30:31 2015 +0200 + + I18n: Update translation en_AU (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 72024be766be27d5b4852e212f81fa9f6e7ed368 +Author: Aputsiaĸ Niels Janussen +Date: Mon Sep 7 18:30:31 2015 +0200 + + I18n: Update translation da (98%). + + 198 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ca97385a05c4c363ba3a1f745df3eae0a57154a1 +Author: Baurzhan Muftakhidinov +Date: Fri Sep 4 12:30:31 2015 +0200 + + I18n: Update translation kk (98%). + + 198 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d187bc85f87ea6e7778ac2cf8dc9c364a59f9fbd +Author: Саша Петровић +Date: Thu Aug 27 18:30:30 2015 +0200 + + I18n: Update translation sr (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0a991612c70d1955022398eb0804dddfe5f266ef +Author: Nobuhiro Iwamatsu +Date: Thu Aug 20 06:30:29 2015 +0200 + + I18n: Update translation ja (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7160de5a078f2db931796c8152e32c1647f9e85e +Author: عبدالله رضوان +Date: Sat Aug 8 00:30:54 2015 +0200 + + I18n: Update translation ar (70%). + + 142 translated messages, 59 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit dabe1876ecd197726d499afb231b09772aa453e6 +Author: abuyop +Date: Fri Jul 31 12:30:30 2015 +0200 + + I18n: Update translation ms (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 08b07135ddb1160ef0d0e3256a387db7cd070fd8 +Author: GenghisKhan +Date: Wed Jul 29 18:30:32 2015 +0200 + + I18n: Update translation he (97%). + + 195 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1d807c85ca8c39fbe35b5b1164941304948af2ac +Author: 玉堂白鹤 +Date: Wed Jul 29 12:30:31 2015 +0200 + + I18n: Update translation zh_CN (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 31730b7405502a731acec383f0cb84585c2e313a +Author: Allan Nordhøy +Date: Wed Jul 29 06:30:30 2015 +0200 + + I18n: Update translation nb (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 186502518d0c5b075aee494652cb734cabbd5ece +Author: Anonymous +Date: Wed Jul 22 18:30:32 2015 +0200 + + I18n: Update translation pt_BR (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 383edef1099875d953aa238e88a73ec2c9aae88b +Author: Anonymous +Date: Tue Jul 21 18:30:53 2015 +0200 + + I18n: Update translation lt (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 307d22054c3dbf0254f2e3880442417bd481547a +Author: Påvel Nicklasson +Date: Mon Jul 20 00:31:50 2015 +0200 + + I18n: Update translation sv (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0fedbaa7adffb373a979161a18095928e2cec7e0 +Author: Tobias Bannert +Date: Tue Jul 7 18:30:37 2015 +0200 + + I18n: Update translation de (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c50a6c3fa9fd9bfffa0881c9dc791ea566c4afcf +Author: Theppitak Karoonboonyanan +Date: Mon Jul 6 12:30:38 2015 +0200 + + I18n: Update translation th (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 98d7719723331b580a88bff9260897316e386d0c +Author: Yarema aka Knedlyk +Date: Sun Jun 28 18:30:39 2015 +0200 + + I18n: Update translation uk (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fe5549a79bd95e87765e25196664a4c4d0834d39 +Author: Michal Várady +Date: Sat Jun 27 12:30:39 2015 +0200 + + I18n: Update translation cs (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0d54db70c22010a5cbdc529a78bfb2ff59874d6c +Author: Anonymous +Date: Wed Jun 24 18:31:06 2015 +0200 + + I18n: Update translation lt (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3eff228827bd8643c94f19c308861e09c209c432 +Author: Necdet Yücel +Date: Wed Jun 24 00:30:38 2015 +0200 + + I18n: Update translation tr (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ac79649a1d0bddd1ca5612ff62874f2fcf838875 +Author: André Miranda +Date: Tue Jun 23 06:30:40 2015 +0200 + + I18n: Update translation pt_BR (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 603de3ebe1289c375c2b4f3789f683e553e1a942 +Author: Sergey Alyoshin +Date: Mon Jun 22 18:30:39 2015 +0200 + + I18n: Update translation ru (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3ac201f6883fa5164d7975bfb69af2759bdd7918 +Author: Eric Koegel +Date: Sun Jun 21 10:30:36 2015 +0300 + + Post release tag bump + +commit f3b12e6c81c8e9208468540b08d669decf10e071 +Author: Eric Koegel +Date: Sun Jun 21 10:25:13 2015 +0300 + + Updates for release. + +commit a16f2d544e3413df74480ecf89e6b5bc59523282 +Author: Seong-ho Cho +Date: Wed Jun 17 00:30:39 2015 +0200 + + I18n: Update translation ko (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 08302c9809386f94d008540808abeeae210a448a +Author: Pjotr +Date: Tue Jun 16 18:31:13 2015 +0200 + + I18n: Update translation nl (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e2d88d4eb902bcd21dbebde01e0b4d1edc8dd641 +Author: Yannick Le Guen +Date: Tue Jun 16 18:31:13 2015 +0200 + + I18n: Update translation fr (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b92cb2c29581514f8f9a31d0b47f425484cbda07 +Author: gabrieltandil +Date: Mon Jun 15 18:30:39 2015 +0200 + + I18n: Update translation es (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1938dbc2f691a83f89b4239ba136ae09398de45a +Author: Anonymous +Date: Mon Jun 15 12:30:40 2015 +0200 + + I18n: Update translation lt (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 628cb7ff47aa222dc7e5153d78a9dc0c96db6205 +Author: Edin Veskovic +Date: Mon Jun 15 12:30:40 2015 +0200 + + I18n: Update translation hr (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fa49bb9dc05cc8c8bba28792d7e9fd6d4103a42a +Author: Kiril Kirilov +Date: Mon Jun 15 12:30:40 2015 +0200 + + I18n: Update translation bg (100%). + + 201 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cf6b25d4d26575a33a3fe14d6812f3526294b63c +Author: Eric Koegel +Date: Sun Jun 14 22:34:47 2015 +0300 + + Bring back the about dialog (Bug #11982) + + This brings back the about dialog for the panel plugin and updates + it for the newer stuff required by GTK3. + +commit 163dc3e3dae710e6a5fc87dc0119597abc685106 +Author: Simon Steinbeiss +Date: Sun Jun 14 21:37:03 2015 +0200 + + Make the settings-app icon 256px for the about dialog + +commit 4a0c4d451ead92d8aa106846530ca62b3243b58b +Author: Anonymous +Date: Fri Jun 12 00:30:38 2015 +0200 + + I18n: Update translation lt (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a805071464ecf0fee27d59de15620b035d855eb0 +Author: Eric Koegel +Date: Thu Jun 11 18:34:27 2015 +0300 + + Use XScreenSaverSuspend and XTestFakeKeyEvent (Bug 11083) + + Use the XScreenSaverSuspend and XTestFakeKeyEvent calls to suspend + the screensaver when we're in presentation mode or something has + requested an inhibit lock. This tries several different ways of + getting the screensaver to stop running since there's no standard + way listed on: http://www.freedesktop.org/wiki/Specifications/ + +commit 1830b5a51aa0b6d86e982bd07156a3804d85167c +Author: Michael Findlay +Date: Thu Jun 11 12:31:06 2015 +0200 + + I18n: Update translation en_AU (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9c766f4f9dfc5185354ab213265efff0d3cc43fd +Author: Eric Koegel +Date: Mon Jun 8 16:23:20 2015 +0300 + + Set label so we don't crash (Bug #11967) + +commit a9fefd658d704beb07b386a4edc0311bafe9ee8e +Author: Simon Steinbeiss +Date: Sat Jun 6 12:06:22 2015 +0200 + + Post release tag bump + +commit 96791fd4e5a85c5be0966586d0ed8fc0b19f3ae2 +Author: Simon Steinbeiss +Date: Sat Jun 6 12:02:21 2015 +0200 + + Updates for release + +commit 441882e4af1cce692352697c4cef4fc9ed42f30b +Author: Simon Steinbeiss +Date: Fri Jun 5 10:21:56 2015 +0200 + + Hidden option to show percentage/remaining time in panel plugin (Bug #4499) + + The property /xfce4-power-manager/show-panel-label has to be added to the channel + xfce4-power-manager as INT. Then you can set the value from 0 to 3, where + 0: hides the label + 1: shows the percentage + 2: shows the remaining time and + 3: shows time and percentage. + + The format is not configurable for now and the label is hidden when UPower reports + the status of the display device as "fully charged". + +commit fad62e2ae968eb1dde59fd43d615d4547872ea63 +Author: Harald Judt +Date: Thu Jun 4 15:21:48 2015 +0200 + + Fix wrong panel plugin button size (bug #11898) + + In deskbar mode, the button takes up too much vertical space and is not + a square. Setting an extra resize request for the button fixes it. + +commit bbf2ec5f5f3d51611a18bee94d5cb9162e5fd50c +Author: Påvel Nicklasson +Date: Wed Jun 3 18:31:52 2015 +0200 + + I18n: Update translation sv (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ffb6b7766252888693c185f05d1ab6756c88240f +Author: Simon Steinbeiss +Date: Thu May 28 10:24:08 2015 +0200 + + Set symbolic fallback icon for plugin and normal one for systray + +commit 4927e6c39162f18e5d56c59b0e14dff044c021a7 +Author: Eric Koegel +Date: Wed May 27 19:18:56 2015 +0300 + + Prevent a crash on device update (Bug #11932) + +commit 1e5d59f233f7cbd493e94a8aaa2c2b45e599370c +Author: Eric Koegel +Date: Wed May 27 19:04:45 2015 +0300 + + Same check for systray + +commit 53fdf5ccc0d3195c410adf894d9f89f48e48ec5c +Author: Eric Koegel +Date: Wed May 27 18:43:53 2015 +0300 + + Fix panel plugin icon loading + + This reverts 0dd1196b8fc5c8634f858c4f68e5ff7360a4da01 + and adds an additional check for UPower returning "" for the icon + name. + +commit 96af26b4131fddbac6a6cee4dcbc7e6291a5118e +Author: Necdet Yücel +Date: Tue May 26 12:31:00 2015 +0200 + + I18n: Update translation tr (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a3a296d00440640a8124c6d1229be046da099d6d +Author: Simon Steinbeiss +Date: Mon May 25 23:46:37 2015 +0200 + + Post release tag bump + +commit 69d7dd60ab937c612746d089a062674488b3383e +Author: Simon Steinbeiss +Date: Mon May 25 23:38:04 2015 +0200 + + Updates for release + +commit 4655f711a6d9bf72f7f6276a1c65d2de696e4d1d +Author: Simon Steinbeiss +Date: Mon May 25 23:29:43 2015 +0200 + + Drop forgotten dbus-client.h from Makefile + +commit 0dd1196b8fc5c8634f858c4f68e5ff7360a4da01 +Author: Eric Koegel +Date: Sat May 23 11:44:45 2015 +0300 + + Fix for panel icon on Desktop systems (Bug #11840) + + This fixes the panel icon on a desktop system with no battery + devices. + +commit 079b94f2ebf0a1a331bfeccc3643d6ca1b2f3a36 +Author: Anonymous +Date: Tue May 5 12:30:52 2015 +0200 + + I18n: Update translation lt (99%). + + 198 translated messages, 2 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fab7a0093e13a984b734a1409f9f4d5690786850 +Author: enolp +Date: Sun May 3 18:30:40 2015 +0200 + + I18n: Update translation ast (86%). + + 173 translated messages, 27 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2d61558b2389962cef2bf871bdc9c5e54ebbc4b5 +Author: Fredrik Nyqvist +Date: Mon Apr 27 00:30:38 2015 +0200 + + I18n: Update translation sv (57%). + + 114 translated messages, 86 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 34963d66a292145e494344f719e7f86b25dd3408 +Author: Seong-ho Cho +Date: Sun Apr 26 18:30:37 2015 +0200 + + I18n: Update translation ko (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c5acaa8649c8f5eaca14fd7e507b286d5ec68d82 +Author: Simon Steinbeiss +Date: Fri Apr 24 01:00:06 2015 +0200 + + Look up the schema for light-locker's settings recursively (Bug #11488) + +commit 2c36ae152063984628700fd22bed2f6149a0fd58 +Author: Simon Steinbeiss +Date: Sun Apr 19 19:01:12 2015 +0200 + + Add icon for ac adapters in the panel plugin + +commit b351004453dd63065e5f4abef51f48a2231da86f +Author: abuyop +Date: Sun Apr 19 18:30:37 2015 +0200 + + I18n: Update translation ms (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 045712f6e03a1f1a67d62e23a8db8980e20c7659 +Author: Simon Steinbeiss +Date: Thu Apr 16 11:50:50 2015 +0200 + + Fix panel plugin not using symbolic icon anymore + + Regression of commit f6ceafb12f43ab7968455cadefdac48383022820 + +commit 9fa2620414150ccf3753fe00e3a2021e4d3f2ce1 +Author: Simon Steinbeiss +Date: Thu Apr 16 09:59:38 2015 +0200 + + Fix icon-name for the panel plugin + +commit f6ceafb12f43ab7968455cadefdac48383022820 +Author: Simon Steinbeiss +Date: Thu Apr 16 08:17:32 2015 +0200 + + Never use symbolic icons for the systray (Bug #11756) + + and always make sure to have an icon name, + even if UPower decides not to return one + +commit 1955b92ab145999625c17566aad8062e5daaee62 +Author: Masato HASHIMOTO +Date: Sat Apr 11 12:30:38 2015 +0200 + + I18n: Update translation ja (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 69f3fc8b58b6a7c8e8459759b608ec9d31e1baf3 +Author: Anonymous +Date: Fri Apr 10 00:30:46 2015 +0200 + + I18n: Update translation lt (98%). + + 196 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 47d4c32249f43c1ce63113a199a0805c0d300458 +Author: 玉堂白鹤 +Date: Thu Apr 9 18:30:39 2015 +0200 + + I18n: Update translation zh_CN (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9e7b4a7bee929b1dd6be3375c1d4b104bf4d660e +Author: Eric Koegel +Date: Thu Apr 9 19:02:30 2015 +0300 + + Bump minimum version requirements + + Match the 4.14 roadmap: + https://wiki.xfce.org/releng/4.14/roadmap + +commit 2ea7ff35bfde435e838beb4eb58cc5b56bb5165f +Author: Anonymous +Date: Thu Apr 9 00:31:12 2015 +0200 + + I18n: Update translation lt (98%). + + 196 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ca7b6c1c7fec7bacf589c9fe7e0d19234c32ca13 +Author: Sergey Alyoshin +Date: Sat Apr 4 12:30:51 2015 +0200 + + I18n: Update translation ru (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b7a731f71c545a039fbe762967cb57bebdc20863 +Author: Eric Koegel +Date: Thu Apr 2 19:55:23 2015 +0300 + + Fix logind inhibit (Bug #11767) + + Signed-off-by: Simon Steinbeiss + +commit cb5cb725165fca7e68332e49ee4bf4b5bbecc9f1 +Author: Anonymous +Date: Fri Apr 3 00:30:38 2015 +0200 + + I18n: Update translation lt (98%). + + 196 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9d86417e6c67c23555700357519e37ac252c331a +Author: Eric Koegel +Date: Wed Apr 1 19:45:23 2015 +0300 + + Fix coverity cid 107694 Uninitialized pointer read + +commit 403fddcdc222bc7fd536606c2f684dfea8b1d452 +Author: Eric Koegel +Date: Wed Apr 1 19:43:53 2015 +0300 + + Fix coverity cid 107695 Uninitialized scalar variable + +commit 76c7a0193648954f09f9890d288db061d843d725 +Author: Anonymous +Date: Tue Mar 31 00:30:38 2015 +0200 + + I18n: Update translation ru (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0ed34d147b25c45b5ecf16b976c7258f9bc9ccfb +Author: Piotr Strębski +Date: Mon Mar 30 18:30:50 2015 +0200 + + I18n: Update translation pl (97%). + + 194 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4530e6a715029403381ee2ec069cc23c4ec95809 +Author: Eric Koegel +Date: Sun Mar 29 15:33:46 2015 +0300 + + Fix build warning + + macro "g_return_if_fail" passed 2 arguments, but takes just 1. + Patch provided by Poma. + +commit d1765ea1355f1d81292514566f50b509e9ee3a5a +Author: Eric Koegel +Date: Sun Mar 29 08:48:00 2015 +0300 + + Undefine XFCE_PLUGIN when building the systray + +commit f6c58f4520f36c5cab3e3192bf3f9b6d4ec21cdb +Author: Eric Koegel +Date: Sat Mar 28 10:59:18 2015 +0300 + + Don't crash when UPower returns "" for the icon-name (Bug #11756) + + I assume this is for devices UPower doesn't know anything about? + +commit 5892136939f37c63fecee7c0700cfcf9ce7a3e97 +Author: Cristian Marchi +Date: Sun Mar 29 12:30:40 2015 +0200 + + I18n: Update translation it (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a87d11fe11759be4de7fd912d65874a32bfb75a1 +Author: Urien Desterres +Date: Sun Mar 29 12:30:40 2015 +0200 + + I18n: Update translation fr (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c009d91df7789396ecc2d78f08f7445486fda2b4 +Author: Allan Nordhøy +Date: Sat Mar 28 18:30:46 2015 +0100 + + I18n: Update translation nb (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2d6830814ff65f50fbab1b4fffeb4582154b5c71 +Author: Yarema aka Knedlyk +Date: Sat Mar 28 12:30:42 2015 +0100 + + I18n: Update translation uk (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a45b2753323ff791cb93b7be22b7c78ca4da9f5e +Author: Michal Várady +Date: Sat Mar 28 12:30:42 2015 +0100 + + I18n: Update translation cs (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 786f5d49bd60f6edaaa60d308816930a8ce52651 +Author: André Miranda +Date: Fri Mar 27 06:30:38 2015 +0100 + + I18n: Update translation pt_BR (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ba8847c9bcb7336dbc672f4202a251f21f434dfa +Author: Baurzhan Muftakhidinov +Date: Thu Mar 26 12:30:39 2015 +0100 + + I18n: Update translation kk (97%). + + 194 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fb190d279fab075e24f40dafc979a5d2565cbd3a +Author: Eric Koegel +Date: Wed Mar 25 15:26:39 2015 +0300 + + Fix some runtime warnings + +commit a055fa2e42204b484b6000afe1e519321948c455 +Author: Eric Koegel +Date: Wed Mar 25 12:17:38 2015 +0300 + + Fix CK suspend/hibernate calls + +commit 89e1a0416ed8c0e404605fc0564878568871d1ca +Author: Tobias Bannert +Date: Wed Mar 25 06:30:37 2015 +0100 + + I18n: Update translation de (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e1caa9f19edacbb340dd8bc1783d0e0a6a94de80 +Author: Tobias Bannert +Date: Wed Mar 25 00:30:38 2015 +0100 + + I18n: Update translation de (97%). + + 195 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3239118dd9c16e1f7b8f17d8ceb6ecc5f1958bf2 +Author: Yannick Le Guen +Date: Tue Mar 24 18:30:39 2015 +0100 + + I18n: Update translation fr (99%). + + 199 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e0a41d927de23818987fe3bd4b2b5d988ca97a6c +Author: Tobias Bannert +Date: Tue Mar 24 18:30:39 2015 +0100 + + I18n: Update translation de (95%). + + 190 translated messages, 10 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 79e8d3ac660edab9f2ced36bc835f950e77070b4 +Author: Michal Várady +Date: Tue Mar 24 18:30:39 2015 +0100 + + I18n: Update translation cs (99%). + + 199 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9bc982784857a6e8e721d5679717ef4c52952314 +Author: Theppitak Karoonboonyanan +Date: Tue Mar 24 12:30:55 2015 +0100 + + I18n: Update translation th (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9e12b471e6cea80e36b9af4a78c5fdf7ec541397 +Author: Саша Петровић +Date: Tue Mar 24 12:30:55 2015 +0100 + + I18n: Update translation sr (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1b0f775322e8adb12d8ec0d33868dce6767c6af1 +Author: Anonymous +Date: Tue Mar 24 12:30:55 2015 +0100 + + I18n: Update translation lt (97%). + + 195 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a6f57ad39e741d8c8684a58a2e87aa68c03bb074 +Author: Yannick Le Guen +Date: Tue Mar 24 12:30:55 2015 +0100 + + I18n: Update translation fr (98%). + + 196 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 619a5690cab8516bf4e6172475e2e23ce73351ee +Author: Anonymous +Date: Tue Mar 24 00:30:49 2015 +0100 + + I18n: Update translation ru (97%). + + 195 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b78712c90bc6c24f3cec61f41824928ca1dd233d +Author: Piotr Sokół +Date: Mon Mar 23 12:30:38 2015 +0100 + + I18n: Update translation pl (93%). + + 187 translated messages, 13 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6edeb7074b3f7d3ff0b05407167a56a8270b9b16 +Author: Jeff Huang +Date: Mon Mar 23 06:30:39 2015 +0100 + + I18n: Update translation zh_TW (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f9e31db3876535873b6e987776ab816f89a03467 +Author: 玉堂白鹤 +Date: Mon Mar 23 06:30:39 2015 +0100 + + I18n: Update translation zh_CN (94%). + + 188 translated messages, 12 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fa58aab2b98732e0d16549ef51474233095185a3 +Author: Manolo Díaz +Date: Mon Mar 23 06:30:38 2015 +0100 + + I18n: Update translation es (100%). + + 200 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 40ecaf40038623d68558a9a3cfec81377108e660 +Author: Anonymous +Date: Sun Mar 22 18:30:39 2015 +0100 + + I18n: Update translation sl (97%). + + 199 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8fc415c498401f94d800564275f9d5db7a674c4a +Author: Simon Steinbeiss +Date: Sun Mar 22 13:39:19 2015 +0100 + + Simplify icon loading for the panel plugin + +commit f114339777d9fa7a618acb7fdca7c9a7ba72ff7a +Author: Eric Koegel +Date: Sun Mar 22 15:01:50 2015 +0300 + + Update POTFILES.in + +commit 61a4c3fff1e5638e7355f575fafd1a05097bb652 +Author: Eric Koegel +Date: Sun Mar 22 11:14:27 2015 +0300 + + Settings: Use a quit signal to exit + + This allows the settings app to properly to exit when it's a + GtkPlug. + +commit b724bcc115245f713300d51b0a5370b762a9f675 +Author: Eric Koegel +Date: Fri Mar 20 18:13:26 2015 +0300 + + fix a couple minor memory leaks + +commit d4403c194ba1fa7f3ce0ca836ea058bfe1142947 +Author: Eric Koegel +Date: Fri Mar 20 17:23:49 2015 +0300 + + Don't call present/show + + Bringing the window to the foreground when it's a GtkPlug causes + the main dialog window contents to appear as a floating window. So + let's not do that. + +commit 1c13a6f3790d26c85146052d2e9624b95eb20c4e +Author: Eric Koegel +Date: Fri Mar 20 14:39:46 2015 +0300 + + trivial: make the ll warning a debug message + +commit 7e2a80cc3df46f76c4b0cc617f94a9965f2452b4 +Author: Eric Koegel +Date: Fri Mar 20 14:36:37 2015 +0300 + + trivial: fix runtime warning + +commit fb7ecef4b7a794934e1527b6682ecc0373f3ed00 +Author: Eric Koegel +Date: Fri Mar 20 11:41:13 2015 +0300 + + Settings: Select the device-id + + When the device-id is selected after the window is open, switch + to the devices tab and select it. + +commit dac971a610788daeddcd5c9eae2b365abbcb2b91 +Author: Eric Koegel +Date: Fri Mar 20 11:21:14 2015 +0300 + + Settings: Present the window when launched again + + When the settings app is launched after it's already shown, present + it rather than launching a new one. + +commit 89aa61c39fdb2ae8b60992350ac6e33670b3cbcf +Author: Eric Koegel +Date: Fri Mar 20 11:02:52 2015 +0300 + + This is better + + Just create an activate action to perform the default action on + the primary instance, also don't create additional windows. We + need to make the settings dialog take an update for when device + icons are clicked in the panel plugin. + +commit 553ff3cf76706c3ca170a94f0ec0d2fd737f2796 +Author: Eric Koegel +Date: Fri Mar 20 10:34:04 2015 +0300 + + Settings: Don't be unique + + We don't want the single app logic for settings because it can be + a normal dialog and plugged into the settings manager at the same + time. + +commit 6f7a542590f0f4c6629a43d2571b61d2a5a4c2aa +Author: Eric Koegel +Date: Fri Mar 20 10:21:38 2015 +0300 + + trivial: unused variables + +commit 8f1268564d171d8f4a7839d541d10f80e8a2b1fd +Author: Eric Koegel +Date: Fri Mar 20 08:28:24 2015 +0300 + + Settings: Add actions for cli options + + This patch adds actions to map the existing cli options. It allows + the settings dialog to be embedded as a plug and the device-id + mapping for the devices tab. Might need to rework the settings + app a little so it can active the device item rather than launch + a new window. + +commit 52e74ba9d1267649f72381a3cbace9a0f86684f6 +Author: Peter de Ridder +Date: Mon Mar 16 20:18:19 2015 +0100 + + Removed remaining org.xfce.unique + +commit c7ac672ba07295cb962bc58c263e15fac08801c0 +Author: Eric Koegel +Date: Mon Mar 16 19:42:24 2015 +0300 + + trivial: update gitignore + +commit cdafab7dd8d9fefa7ff96828a53975a0a021b27a +Author: Eric Koegel +Date: Mon Mar 16 19:41:42 2015 +0300 + + Fix build warnings with --enable-debug=full + +commit 6eedcd26121fc99abe09d37f2c5d562450d485d0 +Author: Eric Koegel +Date: Mon Mar 16 19:30:24 2015 +0300 + + Settings: Port to GtkApplication + + This changes the settings app to use GtkApplication to handle + process uniqueness rather than our custom version. Currently, + the command line doesn't get handeled properly so it doesn't plug + and the plugin doesn't popup the correct device item. - function check_for_consolekit2 is not used if !UP_CHECK_VERSION(0, 99, 0) +commit b3eb1f464c7c2d9e3c527f3d10041f8d564faa10 +Author: Simon Steinbeiss +Date: Mon Mar 16 15:43:10 2015 +0100 + + Two minor fixes in the settings dialog + +commit 736d873ee7ddc320ba62d348676ddfbab074b57f +Author: Simon Steinbeiss +Date: Mon Mar 16 15:32:42 2015 +0100 + + Simplify icon loading and drop unused function + +commit a5c04e45cd9f68fd41e2de87d0d95eecdfad2628 +Author: Simon Steinbeiss +Date: Mon Mar 16 15:07:35 2015 +0100 + + Fix the GtkStyleContext for the parent widget being NULL - Signed-off-by: Eric Koegel + When the plugin's button is first shown (and consequently + the icon is set for it), the button isn't packed inside the + parent widget yet, consequently the GtkStyleContext is NULL. + +commit eab2a2905d5b648ae440d956aa2fda230b26b953 +Author: Simon Steinbeiss +Date: Mon Mar 16 14:15:17 2015 +0100 + + Drop GtkAlignment, replace some CheckButtons with GtkSwitch in settings + +commit 197243e1f6293452bebfa49268536c24097b34d6 +Author: Simon Steinbeiss +Date: Sun Mar 15 23:26:50 2015 +0100 + + Drop superfluous ui file + + The custom brightness notification was already dropped in + commit 5ac47c842bb53ba7ae9240ccd2af7c93fe7eecaf, but this + file was forgotten at the time. + +commit b9cf9d4acb7599d7c71e00f8d43a238bc4b7f01d +Author: Simon Steinbeiss +Date: Sun Mar 15 21:03:14 2015 +0100 + + Remove deprecated symbol GtkStyle + +commit ad6e026bad2ff1937114de153e23a53f0c80db14 +Author: Simon Steinbeiss +Date: Sun Mar 15 21:01:19 2015 +0100 + + Replace deprecated style-set signal with style-updated + +commit 50406a5a8feeed32e51a9a06924278fbb1731417 +Author: Simon Steinbeiss +Date: Sun Mar 15 21:01:01 2015 +0100 + + Replace deprecated VBox with Box + +commit 4281865753a04ab0e6fcb32f44987b6cb9aec728 +Author: Simon Steinbeiss +Date: Sun Mar 15 17:22:02 2015 +0100 + + Hide column headers for device details + + The contents of that listview are very obvious without them. + +commit 721055567c1d0dfccfc519ba492b709a13f3b0fe +Author: Peter de Ridder +Date: Sun Mar 15 16:10:21 2015 +0100 + + Ported to gdbus. + +commit 8499aa632ae2445d3cb7de64ced42063db0189e2 +Author: Peter de Ridder +Date: Sun Mar 15 15:47:29 2015 +0100 + + Ported xfpm-errors to gdbus errors. + +commit 08a1359cde81558847802669b897ae062d4b33fe +Author: Peter de Ridder +Date: Sun Mar 15 15:44:08 2015 +0100 + + Removed dbus-binding-tool annotation. + +commit 0b7bb8c0215ca2d5f51e2c052cd7cfa3f8a0eecc +Author: Peter de Ridder +Date: Sun Mar 15 15:39:04 2015 +0100 + + Ported xfpm-dbus-monitor to lowlevel commands. + + This also removed system bus "exit on close" = false. + Ideally this should be replaced by g_dbus_watch_name. + +commit 8e02aafbd0247e93baa267980c8860253907af2a +Author: Peter de Ridder +Date: Sun Mar 15 15:37:31 2015 +0100 + + Ported xfpm-dbus to lowlevel commands. + + Ideally the usage of these functions is replaced by g_dbus_watch_name and + g_dbus_own_name. + +commit 08b4182abda32902e67de91e1ac7d5bf78c3c600 +Author: Peter de Ridder +Date: Mon Mar 9 23:43:43 2015 +0100 + + Replaced dbus-binding-tool with gdbus-codegen + +commit 42892ec44912c9eaef1e9e2ad4d96c07b59fabb5 +Author: Peter de Ridder +Date: Mon Mar 9 20:52:08 2015 +0100 + + Removed all dbus includes and add gio dependency + +commit 91a6a88715cb580eac884514e4ad638832ee59a4 +Author: Simon Steinbeiss +Date: Sun Mar 15 13:42:57 2015 +0100 + + Fix icon-name in two more places + +commit 2d46b9c5e7bb62e61a07df0cf9e12e14f72e5fd8 +Author: Simon Steinbeiss +Date: Sun Mar 15 13:32:37 2015 +0100 + + Fix settings dialog's icon name + +commit 7c5ae951b4f3cf2392b51fb9d8d9aef7274f1d04 +Author: Eric Koegel +Date: Sun Mar 15 14:26:02 2015 +0300 + + UPower 0.99.0 is the new minimum + + Per the 4.14 roadmap, Upower 0.99 is the new minimum so drop support + for older versions. + +commit c859bf08336d89ce152268764dbb39bd18c8869c +Author: Eric Koegel +Date: Sun Mar 15 14:14:40 2015 +0300 + + trivial: missed one + +commit a87bbddf19f195f7910f63cc15cb0996ac6b2cf8 +Author: Eric Koegel +Date: Sun Mar 15 14:05:46 2015 +0300 + + trivial: add additional locations to gitignore + +commit dba7258e43e556ed9bb406f070537967dc17e671 +Author: Eric Koegel +Date: Sun Mar 15 14:04:38 2015 +0300 + + trivial: drop old version checks + + Drop old glib and xfce4ui version checks that aren't required + anymore. + +commit 0b2d0bc1bcd0cfe12f8a2ec7eaebd0465116560d +Author: Eric Koegel +Date: Sun Mar 15 13:58:31 2015 +0300 + + Drop the LXDE panel plugin + + It won't support GTK3 in the LXPanel. It's suggested to either + keep using the 1.4 branch or to use the systray icon once again. + +commit 22febf5f585db700a24f3dd6042fa78fc9c6cd3e +Author: Simon Steinbeiss +Date: Sat Mar 14 21:39:48 2015 +0100 + + Drop the deprecated GtkButton:xalign property + +commit 5fa10f5e9440e8d8d3d5dc085faf87ed2cf0c276 +Author: Simon Steinbeiss +Date: Sat Mar 14 21:10:23 2015 +0100 + + Switch back to GtkImageMenuItem in the panel plugin + + After a discussion with Mattias Clasen and exploring alternative + options, we decided to switch back to GtkImageMenuItem as it works + best for what we want here. + In order for people to be able to compile without warnings, the + relevant parts have been wrapped in G_GNUC_BEGIN_IGNORE_DEPRECATIONS. + +commit 7ba0c99dfdc3a24e665b1c5755f38c7c34ca5a3f +Author: Simon Steinbeiss +Date: Sat Mar 14 20:57:23 2015 +0100 + + Replace GTK_STOCK buttons in the settings dialog + +commit 9efe26ead5bb1e0f100c0d126b105d1ed2d5b131 +Author: Simon Steinbeiss +Date: Sat Mar 14 12:14:28 2015 +0100 + + Migrate to UPower's icon-names + +commit 483ee8b3cf840d2a777759f09a300bee40976704 +Author: Simon Steinbeiss +Date: Wed Mar 11 23:55:07 2015 +0100 + + Fix hover effect on the scale's slider + + Borrowed from upstream libido, thanks to Lars Uebernickel. + +commit 19947006ea77536b134a3404f52ebf9805d5ffaf +Author: Simon Steinbeiss +Date: Wed Mar 11 23:52:38 2015 +0100 + + Fix panel plugin crash + +commit 0f2c4a3a618962aa478feefde3c71d5809ce3210 +Author: Simon Steinbeiss +Date: Sat Mar 7 19:30:56 2015 +0100 + + Update default icon and drop ac-adapter from Makefile + +commit 58d722bcda45c747dccaadde28186126dcd97438 +Author: Simon Steinbeiss +Date: Sat Mar 7 10:47:24 2015 +0100 + + Use UPower's icon names directly for the panel-plugin + + This also means the power-manager's panel-plugin is now compatible with + most modern icon-themes. + +commit 2eeb6ba5f8f9d2de31664364b5bb5f8e9c43d064 +Author: Simon Steinbeiss +Date: Fri Mar 6 13:35:40 2015 +0100 + + Fix scroll-event on the plugin for brightness changes + +commit 753ff937092a9b5010b67bec38497c59802ba8db +Author: Simon Steinbeiss +Date: Fri Mar 6 01:48:37 2015 +0100 + + Bring back the old brightness icon for notifications + + That is until notifyd supports symbolic icons in its + notification bubbles. + +commit d4dd88202c72de432f4887f6f05a5afc9f791378 +Author: Simon Steinbeiss +Date: Fri Mar 6 01:06:51 2015 +0100 + + Remove trailing slash from Makefile + +commit 3f6fa63fb005fc94f934549dc740134c3826b84a +Author: Simon Steinbeiss +Date: Fri Mar 6 00:58:16 2015 +0100 + + Use symbolic brightness icon and fix indenting + +commit 6322e30d2450fa1e138c4e821e260e777f1cc71f +Author: Simon Steinbeiss +Date: Thu Mar 5 23:45:37 2015 +0100 + + Fix showing the brightness icon in the plugin's menu + +commit 72e160231584789c375885003db9dc0b27a4bf84 +Author: Simon Steinbeiss +Date: Thu Mar 5 21:56:50 2015 +0100 + + Drop some useless warnings + +commit 2174e5b77a946006565b7193a31b80c2e4cf86ad +Author: Simon Steinbeiss +Date: Thu Mar 5 21:19:59 2015 +0100 + + Use symbolic icons for the panel-plugin + +commit 9854e82312de01630452f01c353af79c755f9fb3 +Author: Simon Steinbeiss +Date: Thu Mar 5 17:43:54 2015 +0100 + + Fix the scale's slider with Gtk3.14 + + This change was ported from libido upstream: + http://bazaar.launchpad.net/~indicator-applet-developers/ido/trunk.15.04/revision/187 + +commit 816dc11fa1d70a8ef5ef2fcbe20bd489b18fb01a +Author: Eric Koegel +Date: Thu Mar 5 19:11:06 2015 +0300 + + Plugin: Stop crashing! + + Also no more deprecated warnings. + +commit 53b58d0ff6d73fa513861cb45ab8050610af580b +Author: Simon Steinbeiss +Date: Tue Mar 3 19:56:37 2015 +0300 + + Start porting the panel-plugin to Gtk3 + +commit 67eb80579fb662e29596611d6428aec43b5876e9 +Author: Simon Steinbeiss +Date: Mon Mar 2 15:12:35 2015 +0100 + + Replace deprecated gtk_widget_reparent + +commit c4f387f85a099f9572bc332ad2f5e41c821dd6b6 +Author: Eric Koegel +Date: Mon Mar 2 10:55:03 2015 +0300 + + Improve notification icon size + + Before it was forcing the icon to a smaller size. Also switch to + notify_notification_set_image_from_pixbuf since the other method + is deprecated. + +commit 80e4430ec4bca49fa748539ad53d29b12260db3d +Author: Eric Koegel +Date: Mon Mar 2 10:06:45 2015 +0300 + + More GTK3 work + + XfpmBattery was a GtkStatusIcon which has been dropped, so switch + it to a normal GtkWidget. Other minor changes to support things + removed from the Gtk toolkit. + +commit f0a4570a3dc3ab62331ccd5bc6f48e0a730cff43 +Author: Eric Koegel +Date: Mon Mar 2 08:15:25 2015 +0300 + + common: fix deprecated warnings + +commit 91541ccf47c5786c42848c03078e2043cc0b5812 +Author: Simon Steinbeiss +Date: Mon Mar 2 00:16:24 2015 +0100 + + Port settings dialog to Gtk3 + +commit 2087d60f7f535d920ba7590535ee42ba0c2fe394 +Author: Eric Koegel +Date: Sun Mar 1 22:04:29 2015 +0300 + + Start porting to GTK3 + + This starts the port to GTK3. The deprecated warnings for GTK + dropping the system tray are ignored, we can deal with that in + GTK4. + +commit 719234b98ec876b491b11a86959510802fc33a99 +Author: Anonymous +Date: Sun Mar 22 00:30:37 2015 +0100 + + I18n: Update translation lt (97%). + + 199 translated messages, 6 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 60bf1ec84312a9692c8e95888e925d3535e178e7 +Author: Efstathios Iosifidis +Date: Thu Mar 19 00:30:59 2015 +0100 + + I18n: Update translation el (79%). + + 162 translated messages, 43 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ccc1e7b940cf6b95c043f41c317dd9db34a93456 +Author: Anonymous +Date: Wed Mar 18 18:30:37 2015 +0100 + + I18n: Update translation lt (93%). + + 192 translated messages, 13 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 50e6ac3fd60d06ee26638cdfb7f638341a4e7a8d +Author: Anonymous +Date: Wed Mar 18 00:30:44 2015 +0100 + + I18n: Update translation lt (79%). + + 163 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c59c839436abba7ff8897fbfb93131d46fe361e8 +Author: Nuno Miguel +Date: Fri Mar 13 18:30:53 2015 +0100 + + I18n: Update translation pt (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 885294a39a2a985493d6b5f4696e60fd91b183e8 +Author: Anonymous +Date: Fri Mar 13 00:30:39 2015 +0100 + + I18n: Update translation lt (76%). + + 156 translated messages, 49 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7b093d248645ab8fad85ef8653d222cde4a7d796 +Author: Anonymous +Date: Thu Mar 12 12:31:10 2015 +0100 + + I18n: Update translation lt (74%). + + 152 translated messages, 53 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5a39e4c1056c121998589dd3eb6cda5d1ec5b964 +Author: Yarema aka Knedlyk +Date: Tue Mar 10 06:30:49 2015 +0100 + + I18n: Update translation uk (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c2e59c6b58b3d452d530783c015d5b246c7fc124 +Author: Slavko +Date: Sun Mar 8 18:31:00 2015 +0100 + + I18n: Update translation sk (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 60d7f6c18be81091a673e43c1ae3c8238c2e65b8 +Author: Baurzhan Muftakhidinov +Date: Sun Mar 8 18:31:00 2015 +0100 + + I18n: Update translation kk (98%). + + 202 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f74ab7fe59b5399b2d2edf58dc88445fdf407b40 +Author: Masato HASHIMOTO +Date: Sun Mar 8 18:31:00 2015 +0100 + + I18n: Update translation ja (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0966e9d10c533b539e82cb8077e1a1d6024fa942 +Author: David Mohr +Date: Thu Mar 5 16:39:24 2015 -0700 + + Don't distclean files generated in maintainer mode. + + Signed-off-by: Simon Steinbeiss + +commit 1669307f4ed7ac106103c8ad7132cf84f1827715 +Author: Harald +Date: Thu Mar 5 18:30:40 2015 +0100 + + I18n: Update translation nb (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fd6047f885a9e806edd5b4a3c0950a3f1c83f9d3 +Author: Piotr Strębski +Date: Thu Mar 5 12:30:57 2015 +0100 + + I18n: Update translation pl (98%). + + 201 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5dd51e921b33a00709618f0f587ad5a60ac3129e +Author: Ardjuna +Date: Thu Mar 5 12:30:57 2015 +0100 + + I18n: Update translation id (98%). + + 202 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 61246fa4a20732df15fb3f6583b7acc9fedbb928 +Author: Tobias Bannert +Date: Thu Mar 5 06:30:39 2015 +0100 + + I18n: Update translation de (100%). + + 205 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). commit 17c4bcf1354b26fb511ecb297fe01370051f469c Author: Eric Koegel @@ -11860,12 +16399,12 @@ Merge branch 'devkit-power' Conflicts: - data/interfaces/xfpm-settings.ui - src/Makefile.am - src/xfpm-brightness-hal.c - src/xfpm-engine.c - src/xfpm-supply.c - src/xfpm-tray-icon.c + data/interfaces/xfpm-settings.ui + src/Makefile.am + src/xfpm-brightness-hal.c + src/xfpm-engine.c + src/xfpm-supply.c + src/xfpm-tray-icon.c commit bb70cbf94b138c8a07b5ee2877274323fc109555 Author: Piarres Beobide @@ -12633,7 +17172,7 @@ Author: Ali Abdallah Date: Sun Aug 9 14:12:50 2009 +0000 - * version 0.8.3.1 + * version 0.8.3.1 (Old svn revision: 7903) @@ -12642,8 +17181,8 @@ Author: Ali Abdallah Date: Sun Aug 9 12:29:55 2009 +0000 - * Missing signal handler for power button settings (bug #5656). - * Regenerate documentation. + * Missing signal handler for power button settings (bug #5656). + * Regenerate documentation. (Old svn revision: 7901) @@ -12668,8 +17207,8 @@ Author: Ali Abdallah Date: Mon Aug 3 06:40:38 2009 +0000 - * Change the minimum critical level to 5%, the previous commit - was broken and also 1% is too low. + * Change the minimum critical level to 5%, the previous commit + was broken and also 1% is too low. (Old svn revision: 7887) @@ -12677,7 +17216,7 @@ Author: Ali Abdallah Date: Mon Aug 3 06:28:19 2009 +0000 - * Allow 1% as a critical power level option. + * Allow 1% as a critical power level option. (Old svn revision: 7886) @@ -12685,9 +17224,9 @@ Author: Ali Abdallah Date: Sat Aug 1 10:29:05 2009 +0000 - * Remove image from the inhibit option of the tray icon. - * Check if the session is managed before changing the restart style. - * Prepare 0.8.3 + * Remove image from the inhibit option of the tray icon. + * Check if the session is managed before changing the restart style. + * Prepare 0.8.3 (Old svn revision: 7884) @@ -12695,8 +17234,8 @@ Author: Ali Abdallah Date: Fri Jul 31 14:29:39 2009 +0000 - * Get rid of the cairo OSD and use a gtk based one instead - as the old one seems to be problematic on some hardware. + * Get rid of the cairo OSD and use a gtk based one instead + as the old one seems to be problematic on some hardware. (Old svn revision: 7877) @@ -12704,8 +17243,8 @@ Author: Per Kongstad Date: Fri Jul 31 06:40:10 2009 +0000 - * da.po: Danish translation update (Per Kongstad) - * da.po: Danish tranlation update (Per Kongstad) + * da.po: Danish translation update (Per Kongstad) + * da.po: Danish tranlation update (Per Kongstad) (Old svn revision: 7876) @@ -12713,11 +17252,11 @@ Author: Ali Abdallah Date: Thu Jul 30 06:45:53 2009 +0000 - * Fix a typo that prevents from getting the correct - critical configuration. - * Emit a warning and exit normally if failed to register - DBus names instead of exiting abnormally so the session - will try to restart us. + * Fix a typo that prevents from getting the correct + critical configuration. + * Emit a warning and exit normally if failed to register + DBus names instead of exiting abnormally so the session + will try to restart us. (Old svn revision: 7865) @@ -12725,16 +17264,16 @@ Author: Ali Abdallah Date: Mon Jul 27 06:50:10 2009 +0000 - * src/xfpm-battery.c don't notify when starting up. - * src/xfpm-engine.c fix a typo output message. - * src/xfpm-session.c Add error checking for getting DBus connection. - * src/xfpm-shutdown.c more verbosity. - * src/xfpm-main.c don't exit on SIGHUP. - * src/xfpm-manager.c exits if we fail to get primary name owner - of org.freedesktop.PowerManagement. - * libxfpm/xfpm-common.c use xdg-open first to open links. - * Another patch to the interface file by Josef Havran. - * Add the possibility to don't show a tray icon bug 5613. + * src/xfpm-battery.c don't notify when starting up. + * src/xfpm-engine.c fix a typo output message. + * src/xfpm-session.c Add error checking for getting DBus connection. + * src/xfpm-shutdown.c more verbosity. + * src/xfpm-main.c don't exit on SIGHUP. + * src/xfpm-manager.c exits if we fail to get primary name owner + of org.freedesktop.PowerManagement. + * libxfpm/xfpm-common.c use xdg-open first to open links. + * Another patch to the interface file by Josef Havran. + * Add the possibility to don't show a tray icon bug 5613. (Old svn revision: 7848) @@ -12744,7 +17283,7 @@ 2009-07-25 Gabor Kelemen - * hu.po: Translation updated. + * hu.po: Translation updated. (Old svn revision: 7831) @@ -12752,7 +17291,7 @@ Author: Ali Abdallah Date: Fri Jul 24 21:47:05 2009 +0000 - * Better alignement in the interface file, worked by Josef Havran. + * Better alignement in the interface file, worked by Josef Havran. (Old svn revision: 7816) @@ -12760,12 +17299,12 @@ Author: Ali Abdallah Date: Wed Jul 22 08:37:00 2009 +0000 - * in the interface - file instead, not sure why glade inserts this - instead! since - this will not work on gtk+2.12, however the interface file - passes the Gtk version check, a glade bug? anyway this might - fix bug 5599. + * in the interface + file instead, not sure why glade inserts this + instead! since + this will not work on gtk+2.12, however the interface file + passes the Gtk version check, a glade bug? anyway this might + fix bug 5599. (Old svn revision: 7753) @@ -12789,13 +17328,13 @@ Author: Ali Abdallah Date: Sat Jul 18 23:13:13 2009 +0000 - * Allow compilation without network manager support, since some - distros doesn't have it (like Slackware). - * settings/xfpm-settings.c connect to the signals after settings up all - the widgets this way we don't get property_changed signals for nothing. - * Register DBus error code only once at startup to avoid a Metadata - warning error domain. - * Update README, NEWS. + * Allow compilation without network manager support, since some + distros doesn't have it (like Slackware). + * settings/xfpm-settings.c connect to the signals after settings up all + the widgets this way we don't get property_changed signals for nothing. + * Register DBus error code only once at startup to avoid a Metadata + warning error domain. + * Update README, NEWS. (Old svn revision: 7741) @@ -12813,13 +17352,13 @@ Author: Ali Abdallah Date: Thu Jul 16 09:50:42 2009 +0000 - * Provides the following standard DBus methods: - CanReboot(),CanShutdown(),Reboot(),GetPowerSaveStatus(). - * src/xfpm-error.{c,h} correct errors name for non - supported shutdown/hibernate... . - to NoHardwareSupported+Invalid cookie to Cookie not found. - * Update TODO. - * Update the documentation. + * Provides the following standard DBus methods: + CanReboot(),CanShutdown(),Reboot(),GetPowerSaveStatus(). + * src/xfpm-error.{c,h} correct errors name for non + supported shutdown/hibernate... . + to NoHardwareSupported+Invalid cookie to Cookie not found. + * Update TODO. + * Update the documentation. (Old svn revision: 7729) @@ -12827,9 +17366,9 @@ Author: Ali Abdallah Date: Thu Jul 9 14:01:15 2009 +0000 - * src/xfpm-xfconf.c fix a bug affecting 0.8.1.* for the properties prefix. - * src/xfpm-engine.c Fix default idle timeout. - * prepare 0.8.2. + * src/xfpm-xfconf.c fix a bug affecting 0.8.1.* for the properties prefix. + * src/xfpm-engine.c Fix default idle timeout. + * prepare 0.8.2. (Old svn revision: 7707) @@ -12837,14 +17376,14 @@ Author: Ali Abdallah Date: Thu Jul 9 13:18:49 2009 +0000 - * settings/xfpm-settings.c automatically switch inactivity sleep mode - to hibernate if suspend is not supported. - * Allow 15 minutes as a minimum value for idle. - * src/xfpm-dbus-monitor.c Fix regression for detecting when HAL restarts. - * src/xfpm-brightness-widget.c automatically detect if the running - Notification daemon is notify-osd and use its brightness feedback interface for - displaying the brightness level. - * configure.ac.in add 'r' as a prefix for version tag. + * settings/xfpm-settings.c automatically switch inactivity sleep mode + to hibernate if suspend is not supported. + * Allow 15 minutes as a minimum value for idle. + * src/xfpm-dbus-monitor.c Fix regression for detecting when HAL restarts. + * src/xfpm-brightness-widget.c automatically detect if the running + Notification daemon is notify-osd and use its brightness feedback interface for + displaying the brightness level. + * configure.ac.in add 'r' as a prefix for version tag. (Old svn revision: 7706) @@ -12868,7 +17407,7 @@ Author: Ali Abdallah Date: Thu Jul 9 08:59:29 2009 +0000 - * ur.po ur_PK.po: Urdu translation updates (Muhammad Ali Makki) + * ur.po ur_PK.po: Urdu translation updates (Muhammad Ali Makki) (Old svn revision: 7701) @@ -12910,7 +17449,7 @@ Author: Ali Abdallah Date: Fri Jul 3 20:00:40 2009 +0000 - * po/* update po files. + * po/* update po files. (Old svn revision: 7661) @@ -12919,8 +17458,8 @@ Author: Ali Abdallah Date: Fri Jul 3 18:38:28 2009 +0000 - * po/POSTFILES.in added [type: gettext/glade] before the interface - file to fix dropped translatable strings. + * po/POSTFILES.in added [type: gettext/glade] before the interface + file to fix dropped translatable strings. (Old svn revision: 7660) @@ -12929,8 +17468,8 @@ Author: Ali Abdallah Date: Fri Jul 3 17:27:31 2009 +0000 - * data/interfaces/Makefile.am use a sort of filter for interfaces_h - * data/interfaces/xfpm-settings.ui drops a forgotten #define. + * data/interfaces/Makefile.am use a sort of filter for interfaces_h + * data/interfaces/xfpm-settings.ui drops a forgotten #define. (Old svn revision: 7659) @@ -12939,7 +17478,7 @@ Author: Ali Abdallah Date: Fri Jul 3 08:12:02 2009 +0000 - * Patch to avoid installing the ui file. + * Patch to avoid installing the ui file. (Old svn revision: 7658) @@ -12955,8 +17494,8 @@ Author: Ali Abdallah Date: Tue Jun 30 14:41:12 2009 +0000 - * settings/xfpm-setting.c Don't allow brightness timeout to be less than - DPMS sleep timeout. + * settings/xfpm-setting.c Don't allow brightness timeout to be less than + DPMS sleep timeout. (Old svn revision: 7645) @@ -12973,8 +17512,8 @@ Author: Ali Abdallah Date: Sat Jun 27 22:19:57 2009 +0000 - * Use xfpm-dbus-monitor for dbus monitoring stuff, so hal-monitor is removed. - * hal-device.c Fix a Glib warnings when DBus is disconnected. + * Use xfpm-dbus-monitor for dbus monitoring stuff, so hal-monitor is removed. + * hal-device.c Fix a Glib warnings when DBus is disconnected. (Old svn revision: 7631) @@ -12983,10 +17522,10 @@ Author: Ali Abdallah Date: Sat Jun 27 09:18:09 2009 +0000 - * Use "/xfce4-power-manager" as a prefix for properties name to avoid - incompatibile installation with old versions. - * src/xfpm-brightness-widget.c: get rid of a GTimer and use the id of - the timeout function+Make the color of the popup better. + * Use "/xfce4-power-manager" as a prefix for properties name to avoid + incompatibile installation with old versions. + * src/xfpm-brightness-widget.c: get rid of a GTimer and use the id of + the timeout function+Make the color of the popup better. (Old svn revision: 7630) @@ -12994,7 +17533,7 @@ Author: Ali Abdallah Date: Fri Jun 26 10:15:27 2009 +0000 - * Change the style of the brightness popup indicator. + * Change the style of the brightness popup indicator. (Old svn revision: 7629) @@ -13002,9 +17541,9 @@ Author: Ali Abdallah Date: Sun Jun 21 14:01:50 2009 +0000 - * Make the generic common pointers static in the *_new functions. - * src/xfpm-xfconf.c free specs list after usage. - * settings/xfpm-settings.c Fix default DPMS settings on battery power. + * Make the generic common pointers static in the *_new functions. + * src/xfpm-xfconf.c free specs list after usage. + * settings/xfpm-settings.c Fix default DPMS settings on battery power. (Old svn revision: 7624) @@ -13012,8 +17551,8 @@ Author: Ali Abdallah Date: Sat Jun 20 17:50:41 2009 +0000 - * libxfpm/xfpm-common.c Remove no longer used function, that's it - for Today :). + * libxfpm/xfpm-common.c Remove no longer used function, that's it + for Today :). (Old svn revision: 7623) @@ -13022,8 +17561,8 @@ Author: Ali Abdallah Date: Sat Jun 20 17:47:46 2009 +0000 - * Fix default values shown in the settings dialog. - * fix issue reading default values from xfconf. + * Fix default values shown in the settings dialog. + * fix issue reading default values from xfconf. (Old svn revision: 7622) @@ -13031,7 +17570,7 @@ Author: Ali Abdallah Date: Sat Jun 20 17:14:35 2009 +0000 - * Fix a DPMS storage values. + * Fix a DPMS storage values. (Old svn revision: 7621) @@ -13039,18 +17578,18 @@ Author: Ali Abdallah Date: Sat Jun 20 16:40:44 2009 +0000 - * settings/xfpm-settings.c - Get a pointer to the notebook before connecting signals. - * src/xfpm-xfconf.c Store Configurations in GValues instead of - individual variables. - * src/xfpm-xfconf.c All configurations now are properties, this gives us - configuration change signals for FREE. - * settings/xfpm-settings.c Make it compatible with the new configuration - changes. - * src/xfpm-supply.c Allow suspend as a critical action. - * src/xfpm-engine.c Provide lock screen option for LID events. - * po/xfce4-power-manager.pot update for new strings. - * po/* Updates all the po files. + * settings/xfpm-settings.c + Get a pointer to the notebook before connecting signals. + * src/xfpm-xfconf.c Store Configurations in GValues instead of + individual variables. + * src/xfpm-xfconf.c All configurations now are properties, this gives us + configuration change signals for FREE. + * settings/xfpm-settings.c Make it compatible with the new configuration + changes. + * src/xfpm-supply.c Allow suspend as a critical action. + * src/xfpm-engine.c Provide lock screen option for LID events. + * po/xfce4-power-manager.pot update for new strings. + * po/* Updates all the po files. (Old svn revision: 7620) @@ -13058,7 +17597,7 @@ Author: Ali Abdallah Date: Mon Jun 15 13:42:47 2009 +0000 - * Remove libglade and use GtkBuilder instead. + * Remove libglade and use GtkBuilder instead. (Old svn revision: 7580) @@ -13074,9 +17613,9 @@ Author: Ali Abdallah Date: Tue Jun 9 21:04:48 2009 +0000 - *: Updating documentation - *: Don't accept any event for non mapped buttons - *: 0.8.0 release. + *: Updating documentation + *: Don't accept any event for non mapped buttons + *: 0.8.0 release. (Old svn revision: 7519) @@ -13100,9 +17639,9 @@ Author: Ali Abdallah Date: Sat Jun 6 12:22:30 2009 +0000 - *: Use the channel in the private data. - *: Don't show popup message if xfmp is already running and - a new instance is trying to load for some reason. + *: Use the channel in the private data. + *: Don't show popup message if xfmp is already running and + a new instance is trying to load for some reason. (Old svn revision: 7470) @@ -13118,7 +17657,7 @@ Author: Ali Abdallah Date: Thu Jun 4 09:54:13 2009 +0000 - *: Reset the idle counter when we switch from battery to AC and vise versa. + *: Reset the idle counter when we switch from battery to AC and vise versa. (Old svn revision: 7455) @@ -13126,8 +17665,8 @@ Author: Ali Abdallah Date: Fri May 29 15:37:04 2009 +0000 - *: Fix harmless glib warning when we close the critical notification. - *: More verbosity in the battery when debug full is provided. + *: Fix harmless glib warning when we close the critical notification. + *: More verbosity in the battery when debug full is provided. (Old svn revision: 7438) @@ -13143,8 +17682,8 @@ Author: Ali Abdallah Date: Wed May 27 08:42:07 2009 +0000 - *: use G_HAVE_ISO_VARARGS to chech if variadic macro are supported - *: Fix some English mispelling mistakes in the doc. + *: use G_HAVE_ISO_VARARGS to chech if variadic macro are supported + *: Fix some English mispelling mistakes in the doc. (Old svn revision: 7426) @@ -13152,8 +17691,8 @@ Author: Ali Abdallah Date: Tue May 26 07:47:28 2009 +0000 - *: Provide the possibility to disable the brightness popup - indicator in a hidden option. + *: Provide the possibility to disable the brightness popup + indicator in a hidden option. (Old svn revision: 7423) @@ -13169,8 +17708,8 @@ Author: Ali Abdallah Date: Sun May 24 13:25:22 2009 +0000 - *: Fix minor issue of displaying adapter icon on desktop computers - *: Minor changes in the glade file. + *: Fix minor issue of displaying adapter icon on desktop computers + *: Minor changes in the glade file. (Old svn revision: 7415) @@ -13186,12 +17725,12 @@ Author: Ali Abdallah Date: Thu May 21 14:33:05 2009 +0000 - *: Properly free the inhibitor data when the inhibitor - *: Don't accept events at all if they were not mapped. - *: Fix warning button action in the critical notification. - *: Show the "estimated time to be fully charged" when we have - relevent estimation. - *: Fix suspend/hibernate button configuration problem. + *: Properly free the inhibitor data when the inhibitor + *: Don't accept events at all if they were not mapped. + *: Fix warning button action in the critical notification. + *: Show the "estimated time to be fully charged" when we have + relevent estimation. + *: Fix suspend/hibernate button configuration problem. @@ -13217,7 +17756,7 @@ Author: Per Kongstad Date: Thu May 21 11:00:07 2009 +0000 - * da.po: Danish tranlation update (Per Kongstad) + * da.po: Danish tranlation update (Per Kongstad) (Old svn revision: 7385) @@ -13233,8 +17772,8 @@ Author: Ali Abdallah Date: Wed May 20 08:31:38 2009 +0000 - * :Correct the makefile of the doc - * :Reduce suspend/hibernate timeout if the user disable screen saver lock + * :Correct the makefile of the doc + * :Reduce suspend/hibernate timeout if the user disable screen saver lock (Old svn revision: 7377) @@ -13242,7 +17781,7 @@ Author: Ali Abdallah Date: Tue May 19 14:16:07 2009 +0000 - * RC2: release + * RC2: release (Old svn revision: 7371) @@ -13250,7 +17789,7 @@ Author: Ali Abdallah Date: Tue May 19 10:28:02 2009 +0000 - * : Use GError in the get brightness method. + * : Use GError in the get brightness method. (Old svn revision: 7370) @@ -13258,13 +17797,13 @@ Author: Ali Abdallah Date: Tue May 19 10:04:51 2009 +0000 - * : check brightness value and only display relevent values in - the brightness popup. - * : Load the brightness object in idle, seems to fix the issue - of wrong num_level sent from HAL on aspire one machine. - * : Provides LowBattery DBus signal. - * : Doesn't show funny estimated battery time to be fully charged - in case of wrong value estimated. + * : check brightness value and only display relevent values in + the brightness popup. + * : Load the brightness object in idle, seems to fix the issue + of wrong num_level sent from HAL on aspire one machine. + * : Provides LowBattery DBus signal. + * : Doesn't show funny estimated battery time to be fully charged + in case of wrong value estimated. (Old svn revision: 7369) @@ -13272,12 +17811,12 @@ Author: Ali Abdallah Date: Mon May 18 18:34:30 2009 +0000 - * : Fix inactivity sleep string in the settings dialog to - Suspend instead of suspend (same for hibernate). - * : Change the storage type of some variables used in xfpm-debug.c - * : some optimization for const fuctions. - * : use G_GNUC_NORETURN in the xfpm_start and the - xfpm_show_version functions. + * : Fix inactivity sleep string in the settings dialog to + Suspend instead of suspend (same for hibernate). + * : Change the storage type of some variables used in xfpm-debug.c + * : some optimization for const fuctions. + * : use G_GNUC_NORETURN in the xfpm_start and the + xfpm_show_version functions. (Old svn revision: 7366) @@ -13285,8 +17824,8 @@ Author: Ali Abdallah Date: Mon May 18 16:28:12 2009 +0000 - * : libxfpm/xfpm-notify Remove unused parameter to some functions. - * : xfpm-debug.h Check if the compiler supports variadic macros. + * : libxfpm/xfpm-notify Remove unused parameter to some functions. + * : xfpm-debug.h Check if the compiler supports variadic macros. (Old svn revision: 7363) @@ -13441,7 +17980,7 @@ Author: Per Kongstad Date: Fri May 1 11:12:03 2009 +0000 - * da.po: Danish tranlation update (Per Kongstad) + * da.po: Danish tranlation update (Per Kongstad) (Old svn revision: 7300) @@ -13966,7 +18505,7 @@ Author: Per Kongstad Date: Wed Apr 1 16:57:24 2009 +0000 - * da.po: Danish tranlation update (Per Kongstad) + * da.po: Danish tranlation update (Per Kongstad) (Old svn revision: 7087) @@ -14632,27 +19171,27 @@ Date: Sat Feb 7 20:03:58 2009 +0000 xfce4-volstatus-icon/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfburn/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-timer-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-clipman-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) ristretto/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-mount-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) notification-daemon-xfce/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) xfce4-power-manager/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) xfce4-battery-plugin/trunk/po: - * sv.po: Swedish translation update (Daniel Nylander) + * sv.po: Swedish translation update (Daniel Nylander) (Old svn revision: 6656) @@ -14788,7 +19327,7 @@ Author: Per Kongstad Date: Thu Jan 22 19:23:19 2009 +0000 - * da.po: Danish translation update 0.6.0 (Per Kongstad) + * da.po: Danish translation update 0.6.0 (Per Kongstad) @@ -14917,43 +19456,43 @@ Date: Mon Jan 12 23:30:19 2009 +0000 thunar-svn-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-cddrive-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-weather-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-volstatus-icon/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-quicklauncher-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-timer-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-clipman-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-diskperf-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-mailwatch-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) ristretto/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-sensors-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-mount-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-genmon-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) thunar-volman/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) notification-daemon-xfce/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-power-manager/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-dict/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-cellmodem-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) xfce4-battery-plugin/trunk/po: - * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) + * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) (Old svn revision: 6445) diff -Nru xfce4-power-manager-1.4.4/common/Makefile.am xfce4-power-manager-1.6.1/common/Makefile.am --- xfce4-power-manager-1.4.4/common/Makefile.am 2014-05-27 10:29:58.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/Makefile.am 2017-11-23 23:52:06.000000000 +0000 @@ -28,7 +28,7 @@ $(GTK_LIBS) \ $(GLIB_LIBS) \ $(XRANDR_LIBS) \ - $(X11_LIBS) \ + $(LIBX11_LIBS) \ $(DBUS_GLIB_LIBS) \ $(UPOWER_LIBS) diff -Nru xfce4-power-manager-1.4.4/common/Makefile.in xfce4-power-manager-1.6.1/common/Makefile.in --- xfce4-power-manager-1.4.4/common/Makefile.in 2015-03-22 11:30:38.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/Makefile.in 2017-12-18 23:15:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,12 +89,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = common -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -93,8 +102,7 @@ am__DEPENDENCIES_1 = libxfpmcommon_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__objects_1 = libxfpmcommon_la-xfpm-enum-types.lo am_libxfpmcommon_la_OBJECTS = $(am__objects_1) \ libxfpmcommon_la-xfpm-common.lo \ @@ -170,6 +178,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@ @@ -190,14 +199,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_GLIB_REQUIRED_VERSION = @DBUS_GLIB_REQUIRED_VERSION@ -DBUS_GLIB_VERSION = @DBUS_GLIB_VERSION@ -DBUS_LIBS = @DBUS_LIBS@ -DBUS_REQUIRED_VERSION = @DBUS_REQUIRED_VERSION@ -DBUS_VERSION = @DBUS_VERSION@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -211,6 +212,10 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GIO_REQUIRED_VERSION = @GIO_REQUIRED_VERSION@ +GIO_VERSION = @GIO_VERSION@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@ @@ -249,6 +254,7 @@ 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@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ @@ -258,6 +264,9 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@ LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ @@ -273,14 +282,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LXDEPANEL_CFLAGS = @LXDEPANEL_CFLAGS@ -LXDEPANEL_LIBS = @LXDEPANEL_LIBS@ -LXDEPANEL_NEW_CFLAGS = @LXDEPANEL_NEW_CFLAGS@ -LXDEPANEL_NEW_LIBS = @LXDEPANEL_NEW_LIBS@ -LXDEPANEL_NEW_REQUIRED_VERSION = @LXDEPANEL_NEW_REQUIRED_VERSION@ -LXDEPANEL_NEW_VERSION = @LXDEPANEL_NEW_VERSION@ -LXDEPANEL_REQUIRED_VERSION = @LXDEPANEL_REQUIRED_VERSION@ -LXDEPANEL_VERSION = @LXDEPANEL_VERSION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -324,20 +326,21 @@ UPOWER_VERSION = @UPOWER_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ -X11_CFLAGS = @X11_CFLAGS@ -X11_LIBS = @X11_LIBS@ -X11_REQUIRED_VERSION = @X11_REQUIRED_VERSION@ -X11_VERSION = @X11_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@ XRANDR_CFLAGS = @XRANDR_CFLAGS@ XRANDR_LIBS = @XRANDR_LIBS@ XRANDR_REQUIRED_VERSION = @XRANDR_REQUIRED_VERSION@ XRANDR_VERSION = @XRANDR_VERSION@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -384,6 +387,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -422,7 +426,7 @@ $(GTK_LIBS) \ $(GLIB_LIBS) \ $(XRANDR_LIBS) \ - $(X11_LIBS) \ + $(LIBX11_LIBS) \ $(DBUS_GLIB_LIBS) \ $(UPOWER_LIBS) @@ -450,7 +454,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu common/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -763,6 +766,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + @MAINTAINER_MODE_TRUE@xfpm-enum-types.h: $(xfpm_glib_headers) @MAINTAINER_MODE_TRUE@ ( cd $(srcdir) && glib-mkenums \ diff -Nru xfce4-power-manager-1.4.4/common/xfpm-brightness.c xfce4-power-manager-1.6.1/common/xfpm-brightness.c --- xfce4-power-manager-1.4.4/common/xfpm-brightness.c 2015-02-11 14:25:13.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/xfpm-brightness.c 2017-11-23 23:52:06.000000000 +0000 @@ -51,7 +51,7 @@ gint output; gboolean xrandr_has_hw; gboolean helper_has_hw; - + gint32 max_level; gint32 current_level; gint32 min_level; @@ -68,24 +68,24 @@ gdk_error_trap_push (); info = XRRQueryOutputProperty (gdk_x11_get_default_xdisplay (), output, brightness->priv->backlight); - + if (gdk_error_trap_pop () != 0 || info == NULL) { g_warning ("could not get output property"); return FALSE; } - - if (!info->range || info->num_values != 2) + + if (!info->range || info->num_values != 2) { g_warning ("no range found"); ret = FALSE; goto out; } - + *min = info->values[0]; *max = info->values[1]; - + out: XFree (info); return ret; @@ -111,15 +111,15 @@ g_warning ("failed to get property"); return FALSE; } - - if (actual_type == XA_INTEGER && nitems == 1 && actual_format == 32) + + if (actual_type == XA_INTEGER && nitems == 1 && actual_format == 32) { memcpy (current, prop, sizeof (*current)); ret = TRUE; } - + XFree (prop); - + return ret; } @@ -131,16 +131,16 @@ gdk_error_trap_push (); XRRChangeOutputProperty (gdk_x11_get_default_xdisplay (), output, brightness->priv->backlight, XA_INTEGER, 32, PropModeReplace, (unsigned char *) &level, 1); - + XFlush (gdk_x11_get_default_xdisplay ()); gdk_flush (); - - if ( gdk_error_trap_pop () ) + + if ( gdk_error_trap_pop () ) { g_warning ("failed to XRRChangeOutputProperty for brightness %d", level); ret = FALSE; } - + return ret; } @@ -155,43 +155,43 @@ gint32 min, max; gboolean ret = FALSE; gint i; - + gdk_error_trap_push (); if (!XRRQueryExtension (gdk_x11_get_default_xdisplay (), &event_base, &error_base) || !XRRQueryVersion (gdk_x11_get_default_xdisplay (), &major, &minor) ) { - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); g_warning ("No XRANDR extension found"); return FALSE; } - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); if (major == 1 && minor < 2) { g_warning ("XRANDR version < 1.2"); return FALSE; } - + #ifdef RR_PROPERTY_BACKLIGHT brightness->priv->backlight = XInternAtom (gdk_x11_get_default_xdisplay (), RR_PROPERTY_BACKLIGHT, True); if (brightness->priv->backlight == None) /* fall back to deprecated name */ #endif brightness->priv->backlight = XInternAtom (gdk_x11_get_default_xdisplay (), "BACKLIGHT", True); - - if (brightness->priv->backlight == None) + + if (brightness->priv->backlight == None) { g_warning ("No outputs have backlight property"); return FALSE; } - + screen = gdk_display_get_default_screen (gdk_display_get_default ()); - - screen_num = gdk_screen_get_number (screen); + + screen_num = gdk_x11_screen_get_screen_number (screen); gdk_error_trap_push (); - + window = RootWindow (gdk_x11_get_default_xdisplay (), screen_num); - + #if (RANDR_MAJOR == 1 && RANDR_MINOR >=3 ) if (major > 1 || minor >= 3) brightness->priv->resource = XRRGetScreenResourcesCurrent (gdk_x11_get_default_xdisplay (), window); @@ -205,7 +205,7 @@ if ( g_str_has_prefix (info->name, "LVDS") || g_str_has_prefix (info->name, "eDP") ) { - + if ( xfpm_brightness_xrand_get_limit (brightness, brightness->priv->resource->outputs[i], &min, &max) && min != max ) { @@ -213,14 +213,14 @@ brightness->priv->output = brightness->priv->resource->outputs[i]; brightness->priv->step = max <= 20 ? 1 : max / 10; } - + } XRRFreeOutputInfo (info); } if (gdk_error_trap_pop () != 0) g_critical ("Failed to get output/resource info"); - + return ret; } @@ -230,9 +230,9 @@ gint32 hw_level; gboolean ret = FALSE; gint32 set_level; - + ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); - + if ( !ret ) return FALSE; @@ -241,26 +241,26 @@ *new_level = brightness->priv->max_level; return TRUE; } - + set_level = MIN (hw_level + brightness->priv->step, brightness->priv->max_level ); - + g_warn_if_fail (xfpm_brightness_xrandr_set_level (brightness, brightness->priv->output, set_level)); - + ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, new_level); - + if ( !ret ) { g_warning ("xfpm_brightness_xrand_up failed for %d", set_level); return FALSE; } - + /* Nothing changed in the hardware*/ if ( *new_level == hw_level ) { g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level); return FALSE; } - + return TRUE; } @@ -270,37 +270,37 @@ gint32 hw_level; gboolean ret; gint32 set_level; - + ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); - + if ( !ret ) return FALSE; - + if ( hw_level == brightness->priv->min_level ) { *new_level = brightness->priv->min_level; return TRUE; } - + set_level = MAX (hw_level - brightness->priv->step, brightness->priv->min_level); - + g_warn_if_fail (xfpm_brightness_xrandr_set_level (brightness, brightness->priv->output, set_level)); - + ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, new_level); - + if ( !ret ) { g_warning ("xfpm_brightness_xrand_down failed for %d", set_level); return FALSE; } - + /* Nothing changed in the hardware*/ if ( *new_level == hw_level ) { g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level); return FALSE; } - + return TRUE; } @@ -460,9 +460,9 @@ gint32 hw_level; gboolean ret = FALSE; gint32 set_level; - + ret = xfpm_brightness_helper_get_level (brightness, &hw_level); - + if ( !ret ) return FALSE; @@ -471,26 +471,26 @@ *new_level = brightness->priv->max_level; return TRUE; } - + set_level = MIN (hw_level + brightness->priv->step, brightness->priv->max_level ); - + g_warn_if_fail (xfpm_brightness_helper_set_level (brightness, set_level)); - + ret = xfpm_brightness_helper_get_level (brightness, new_level); - + if ( !ret ) { g_warning ("xfpm_brightness_helper_up failed for %d", set_level); return FALSE; } - + /* Nothing changed in the hardware*/ if ( *new_level == hw_level ) { g_warning ("xfpm_brightness_helper_up did not change the hw level to %d", set_level); return FALSE; } - + return TRUE; } @@ -500,37 +500,37 @@ gint32 hw_level; gboolean ret; gint32 set_level; - + ret = xfpm_brightness_helper_get_level (brightness, &hw_level); - + if ( !ret ) return FALSE; - + if ( hw_level <= brightness->priv->min_level ) { *new_level = brightness->priv->min_level; return TRUE; } - + set_level = MAX (hw_level - brightness->priv->step, brightness->priv->min_level); - + g_warn_if_fail (xfpm_brightness_helper_set_level (brightness, set_level)); - + ret = xfpm_brightness_helper_get_level (brightness, new_level); - + if ( !ret ) { g_warning ("xfpm_brightness_helper_down failed for %d", set_level); return FALSE; } - + /* Nothing changed in the hardware*/ if ( *new_level == hw_level ) { g_warning ("xfpm_brightness_helper_down did not change the hw level to %d", set_level); return FALSE; } - + return TRUE; } @@ -550,7 +550,7 @@ xfpm_brightness_init (XfpmBrightness *brightness) { brightness->priv = XFPM_BRIGHTNESS_GET_PRIVATE (brightness); - + brightness->priv->resource = NULL; brightness->priv->xrandr_has_hw = FALSE; brightness->priv->helper_has_hw = FALSE; @@ -597,13 +597,13 @@ if ( brightness->priv->xrandr_has_hw ) { xfpm_brightness_xrand_get_limit (brightness, - brightness->priv->output, - &brightness->priv->min_level, + brightness->priv->output, + &brightness->priv->min_level, &brightness->priv->max_level); - g_debug ("Brightness controlled by xrandr, min_level=%d max_level=%d", - brightness->priv->min_level, + g_debug ("Brightness controlled by xrandr, min_level=%d max_level=%d", + brightness->priv->min_level, brightness->priv->max_level); - + return TRUE; } #ifdef ENABLE_POLKIT @@ -615,7 +615,7 @@ #else g_debug ("xrandr not available, brightness controlled by sysfs helper; min_level=%d max_level=%d", #endif - brightness->priv->min_level, + brightness->priv->min_level, brightness->priv->max_level); return TRUE; } @@ -628,11 +628,11 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level) { gboolean ret = FALSE; - + if ( brightness->priv->xrandr_has_hw ) { ret = xfpm_brightness_xrand_up (brightness, new_level); - } + } #ifdef ENABLE_POLKIT else if ( brightness->priv->helper_has_hw ) { @@ -645,13 +645,13 @@ gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level) { gboolean ret = FALSE; - + if ( brightness->priv->xrandr_has_hw ) { ret = xfpm_brightness_xrand_down (brightness, new_level); if ( ret ) ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, new_level); - } + } #ifdef ENABLE_POLKIT else if ( brightness->priv->helper_has_hw ) { @@ -674,7 +674,7 @@ gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, gint32 *level) { gboolean ret = FALSE; - + if ( brightness->priv->xrandr_has_hw ) ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, level); #ifdef ENABLE_POLKIT @@ -688,28 +688,28 @@ gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level) { gboolean ret = FALSE; - + if (brightness->priv->xrandr_has_hw ) ret = xfpm_brightness_xrandr_set_level (brightness, brightness->priv->output, level); #ifdef ENABLE_POLKIT else if ( brightness->priv->helper_has_hw ) ret = xfpm_brightness_helper_set_level (brightness, level); #endif - + return ret; } gboolean xfpm_brightness_dim_down (XfpmBrightness *brightness) { gboolean ret = FALSE; - + if (brightness->priv->xrandr_has_hw ) ret = xfpm_brightness_xrandr_set_level (brightness, brightness->priv->output, brightness->priv->min_level); #ifdef ENABLE_POLKIT else if ( brightness->priv->helper_has_hw ) ret = xfpm_brightness_helper_set_level (brightness, brightness->priv->min_level); #endif - + return ret; } diff -Nru xfce4-power-manager-1.4.4/common/xfpm-common.c xfce4-power-manager-1.6.1/common/xfpm-common.c --- xfce4-power-manager-1.4.4/common/xfpm-common.c 2014-07-14 07:23:45.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/xfpm-common.c 2017-11-23 23:52:06.000000000 +0000 @@ -52,35 +52,6 @@ return builder; } -gboolean -xfpm_lock_screen (void) -{ - gboolean ret = g_spawn_command_line_async ("xflock4", NULL); - - if ( !ret ) - { - ret = g_spawn_command_line_async ("gnome-screensaver-command -l", NULL); - } - - if ( !ret ) - { - /* this should be the default*/ - ret = g_spawn_command_line_async ("xdg-screensaver lock", NULL); - } - - if ( !ret ) - { - ret = g_spawn_command_line_async ("xscreensaver-command -lock", NULL); - } - - if ( !ret ) - { - g_critical ("Connot lock screen\n"); - } - - return ret; -} - void xfpm_preferences (void) { @@ -105,14 +76,14 @@ } void -xfpm_about (GtkWidget *widget, gpointer data) +xfpm_about (gpointer data) { gchar *package = (gchar *)data; - const gchar* authors[3] = + const gchar* authors[] = { - "Ali Abdallah ", - NULL + "Ali Abdallah ", + NULL, }; static const gchar *documenters[] = @@ -121,16 +92,24 @@ NULL, }; + static const gchar *artists[] = + { + "Simon Steinbeiß ", + NULL, + }; + gtk_show_about_dialog (NULL, - "authors", authors, - "copyright", "Copyright \302\251 2008-2011 Ali Abdallah", + "copyright", "Copyright \302\251 2008-2011 Ali Abdallah\nCopyright \302\251 2011-2012 Nick Schermer\nCopyright \302\251 2013-2015 Eric Koegel, Harald Judt, Simon Steinbeiß", "destroy-with-parent", TRUE, + "authors", authors, + "artists", artists, "documenters", documenters, "license", XFCE_LICENSE_GPL, "program-name", package, "translator-credits", _("translator-credits"), "version", PACKAGE_VERSION, - "website", "http://goodies.xfce.org/projects/applications/xfce4-power-manager", + "website", "http://docs.xfce.org/xfce/xfce4-power-manager/1.4/start", + "logo-icon-name", "xfce4-power-manager-settings", NULL); } @@ -139,32 +118,23 @@ { GdkDisplay *dpy; GdkScreen *screen; - gint nscreen; gint nmonitor; dpy = gdk_display_get_default (); - - nscreen = gdk_display_get_n_screens (dpy); - - if ( nscreen == 1 ) + + screen = gdk_display_get_screen (dpy, 0); + if ( screen ) { - screen = gdk_display_get_screen (dpy, 0); - if ( screen ) + nmonitor = gdk_screen_get_n_monitors (screen); + if ( nmonitor > 1 ) { - nmonitor = gdk_screen_get_n_monitors (screen); - if ( nmonitor > 1 ) - { - g_debug ("Multiple monitor connected"); - return TRUE; - } - else - return FALSE; + g_debug ("Multiple monitor connected"); + return TRUE; + } + else + { + return FALSE; } - } - else if ( nscreen > 1 ) - { - g_debug ("Multiple screen connected"); - return TRUE; } return FALSE; @@ -178,7 +148,7 @@ pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), icon_name, size, - GTK_ICON_LOOKUP_USE_BUILTIN, + GTK_ICON_LOOKUP_FORCE_SIZE, &error); if ( error ) diff -Nru xfce4-power-manager-1.4.4/common/xfpm-common.h xfce4-power-manager-1.6.1/common/xfpm-common.h --- xfce4-power-manager-1.4.4/common/xfpm-common.h 2014-07-14 07:23:45.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/xfpm-common.h 2017-11-23 23:52:06.000000000 +0000 @@ -40,16 +40,13 @@ GtkBuilder *xfpm_builder_new_from_string (const gchar *file, GError **error); -gboolean xfpm_lock_screen (void); - void xfpm_preferences (void); void xfpm_preferences_device_id (const gchar* object_path); void xfpm_quit (void); -void xfpm_about (GtkWidget *widget, - gpointer data); +void xfpm_about (gpointer data); gboolean xfpm_is_multihead_connected (void); diff -Nru xfce4-power-manager-1.4.4/common/xfpm-config.h xfce4-power-manager-1.6.1/common/xfpm-config.h --- xfce4-power-manager-1.4.4/common/xfpm-config.h 2014-08-20 20:18:43.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/xfpm-config.h 2017-11-23 23:52:06.000000000 +0000 @@ -54,6 +54,7 @@ #define GENERAL_NOTIFICATION_CFG "general-notification" #define PRESENTATION_MODE "presentation-mode" #define NETWORK_MANAGER_SLEEP "network-manager-sleep" +#define HEARTBEAT_COMMAND "heartbeat-command" #define SHOW_TRAY_ICON_CFG "show-tray-icon" #define POWER_SWITCH_CFG "power-button-action" @@ -76,6 +77,7 @@ #define BRIGHTNESS_SWITCH_SAVE "brightness-switch-restore-on-exit" #define HANDLE_BRIGHTNESS_KEYS "handle-brightness-keys" #define SHOW_BRIGHTNESS_POPUP "show-brightness-popup" +#define SHOW_PANEL_LABEL "show-panel-label" G_END_DECLS diff -Nru xfce4-power-manager-1.4.4/common/xfpm-icons.h xfce4-power-manager-1.6.1/common/xfpm-icons.h --- xfce4-power-manager-1.4.4/common/xfpm-icons.h 2014-08-18 17:53:58.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/xfpm-icons.h 2017-11-23 23:52:06.000000000 +0000 @@ -23,27 +23,17 @@ G_BEGIN_DECLS -#define XFPM_AC_ADAPTER_ICON "xfpm-ac-adapter" - -#define XFPM_UPS_ICON "xfpm-ups-100" -#define XFPM_KBD_ICON "input-keyboard" -#define XFPM_MOUSE_ICON "input-mouse" -#define XFPM_PHONE_ICON "phone" -#define XFPM_PDA_ICON "pda" - -#define XFPM_PRIMARY_ICON_PREFIX "xfpm-primary-" -#define XFPM_UPS_ICON_PREFIX "xfpm-ups-" -#define XFPM_MOUSE_ICON_PREFIX "input-mouse" -#define XFPM_KBD_ICON_PREFIX "input-keyboard" -#define XFPM_PDA_ICON_PREFIX "pda" -#define XFPM_PHONE_ICON_PREFIX "phone" -#define XFPM_MEDIA_PLAYER_PREFIX "multimedia-player" -#define XFPM_MONITOR_PREFIX "video-display" -#define XFPM_COMPUTER_ICON_PREFIX "computer" -#define XFPM_TABLET_ICON_PREFIX "tablet" - -#define XFPM_DISPLAY_BRIGHTNESS_ICON "xfpm-brightness-lcd" -#define XFPM_DISPLAY_BRIGHTNESS_INVALID_ICON "xfpm-brightness-lcd-missing" /* When no hw found */ +#define XFPM_AC_ADAPTER_ICON "ac-adapter" +#define XFPM_COMPUTER_ICON "computer" +#define XFPM_DISPLAY_BRIGHTNESS_ICON "display-brightness-symbolic" +#define XFPM_MOUSE_ICON "input-mouse" +#define XFPM_KBD_ICON "input-keyboard" +#define XFPM_MEDIA_PLAYER_ICON "multimedia-player" +#define XFPM_PDA_ICON "pda" +#define XFPM_PHONE_ICON "phone" +#define XFPM_TABLET_ICON "tablet" +#define XFPM_UPS_ICON "uninterruptible-power-supply" +#define XFPM_MONITOR_ICON "video-display" G_END_DECLS diff -Nru xfce4-power-manager-1.4.4/common/xfpm-power-common.c xfce4-power-manager-1.6.1/common/xfpm-power-common.c --- xfce4-power-manager-1.4.4/common/xfpm-power-common.c 2014-11-04 10:25:18.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/xfpm-power-common.c 2017-11-23 23:52:06.000000000 +0000 @@ -23,13 +23,13 @@ #endif #include -#include #include #include "xfpm-power-common.h" #include "xfpm-enum-glib.h" #include "xfpm-icons.h" +#include "xfpm-debug.h" /** @@ -44,7 +44,7 @@ case UP_DEVICE_KIND_BATTERY: return _("Battery"); case UP_DEVICE_KIND_UPS: - return _("UPS"); + return _("Uninterruptible Power Supply"); case UP_DEVICE_KIND_LINE_POWER: return _("Line power"); case UP_DEVICE_KIND_MOUSE: @@ -96,33 +96,6 @@ return _("Unknown"); } -const gchar * G_GNUC_CONST -xfpm_battery_get_icon_index (UpDeviceKind type, guint percent) -{ - if (percent < 10) - { - return "000"; - } - else if (percent < 30) - { - return "020"; - } - else if (percent < 50) - { - return "040"; - } - else if (percent < 70) - { - return "060"; - } - else if (percent < 90) - { - return "080"; - } - - return "100"; -} - /* * Taken from gpm */ @@ -167,60 +140,6 @@ return timestring; } -gchar * -xfpm_battery_get_icon_prefix_device_enum_type (UpDeviceKind type) -{ - /* mapped from - * http://cgit.freedesktop.org/upower/tree/libupower-glib/up-types.h - */ - if ( type == UP_DEVICE_KIND_BATTERY ) - { - return g_strdup (XFPM_PRIMARY_ICON_PREFIX); - } - else if ( type == UP_DEVICE_KIND_UPS ) - { - return g_strdup (XFPM_UPS_ICON_PREFIX); - } - else if ( type == UP_DEVICE_KIND_MOUSE ) - { - return g_strdup (XFPM_MOUSE_ICON_PREFIX); - } - else if ( type == UP_DEVICE_KIND_KEYBOARD ) - { - return g_strdup (XFPM_KBD_ICON_PREFIX); - } - else if ( type == UP_DEVICE_KIND_PHONE ) - { - return g_strdup (XFPM_PHONE_ICON_PREFIX); - } - else if ( type == UP_DEVICE_KIND_PDA ) - { - return g_strdup (XFPM_PDA_ICON_PREFIX); - } - else if ( type == UP_DEVICE_KIND_MEDIA_PLAYER ) - { - return g_strdup (XFPM_MEDIA_PLAYER_PREFIX); - } - else if ( type == UP_DEVICE_KIND_LINE_POWER ) - { - return g_strdup (XFPM_AC_ADAPTER_ICON); - } - else if ( type == UP_DEVICE_KIND_MONITOR ) - { - return g_strdup (XFPM_MONITOR_PREFIX); - } - else if ( type == UP_DEVICE_KIND_TABLET ) - { - return g_strdup (XFPM_TABLET_ICON_PREFIX); - } - else if ( type == UP_DEVICE_KIND_COMPUTER ) - { - return g_strdup (XFPM_COMPUTER_ICON_PREFIX); - } - - return g_strdup (XFPM_PRIMARY_ICON_PREFIX); -} - static gboolean is_display_device (UpClient *upower, UpDevice *device) { @@ -243,70 +162,66 @@ gchar* get_device_icon_name (UpClient *upower, UpDevice *device) { - gchar *icon_name = NULL, *icon_prefix; - guint type = 0, state = 0; - gboolean online; - gboolean present; - gdouble percentage; + gchar *icon_name = NULL; + gchar *icon_suffix; + gsize icon_base_length; + gchar *upower_icon; + guint type = 0; /* hack, this depends on XFPM_DEVICE_TYPE_* being in sync with UP_DEVICE_KIND_* */ g_object_get (device, - "kind", &type, - "state", &state, - "is-present", &present, - "percentage", &percentage, - "online", &online, - NULL); - - icon_prefix = xfpm_battery_get_icon_prefix_device_enum_type (type); + "kind", &type, + "icon-name", &upower_icon, + NULL); - if ( type == UP_DEVICE_KIND_LINE_POWER ) + /* Strip away the symbolic suffix for the device icons for the devices tab + * and the panel plugin's menu */ + icon_suffix = g_strrstr (upower_icon, "-symbolic"); + if (icon_suffix != NULL) { - if ( online ) - { - icon_name = g_strdup_printf ("%s", XFPM_AC_ADAPTER_ICON); - } - else - { - icon_name = g_strdup_printf ("%s060", XFPM_PRIMARY_ICON_PREFIX); - } - } - else if ( type == UP_DEVICE_KIND_BATTERY || type == UP_DEVICE_KIND_UPS ) - { - if (!present) - { - icon_name = g_strdup_printf ("%s%s", icon_prefix, "missing"); - } - else if (state == UP_DEVICE_STATE_FULLY_CHARGED ) - { - icon_name = g_strdup_printf ("%s%s", icon_prefix, "charged"); - } - else if ( state == UP_DEVICE_STATE_CHARGING || state == UP_DEVICE_STATE_PENDING_CHARGE) - { - icon_name = g_strdup_printf ("%s%s-%s", icon_prefix, xfpm_battery_get_icon_index (type, percentage), "charging"); - } - else if ( state == UP_DEVICE_STATE_DISCHARGING || state == UP_DEVICE_STATE_PENDING_DISCHARGE) - { - icon_name = g_strdup_printf ("%s%s", icon_prefix, xfpm_battery_get_icon_index (type, percentage)); - } - else if ( state == UP_DEVICE_STATE_EMPTY) - { - icon_name = g_strdup_printf ("%s%s", icon_prefix, "000"); - } + icon_base_length = icon_suffix - upower_icon; } else { - if (is_display_device (upower, device)) - { - /* Desktop system with no batteries */ - icon_name = g_strdup_printf ("%s", XFPM_AC_ADAPTER_ICON); - } - else - { - icon_name = icon_prefix; - } + icon_base_length = G_MAXINT; } + XFPM_DEBUG ("icon_suffix %s, icon_base_length %ld, upower_icon %s", + icon_suffix, icon_base_length, upower_icon); + + /* mapped from + * http://cgit.freedesktop.org/upower/tree/libupower-glib/up-types.h + * because UPower doesn't return device-specific icon-names + */ + if ( type == UP_DEVICE_KIND_UPS ) + icon_name = g_strdup (XFPM_UPS_ICON); + else if ( type == UP_DEVICE_KIND_MOUSE ) + icon_name = g_strdup (XFPM_MOUSE_ICON); + else if ( type == UP_DEVICE_KIND_KEYBOARD ) + icon_name = g_strdup (XFPM_KBD_ICON); + else if ( type == UP_DEVICE_KIND_PHONE ) + icon_name = g_strdup (XFPM_PHONE_ICON); + else if ( type == UP_DEVICE_KIND_PDA ) + icon_name = g_strdup (XFPM_PDA_ICON); + else if ( type == UP_DEVICE_KIND_MEDIA_PLAYER ) + icon_name = g_strdup (XFPM_MEDIA_PLAYER_ICON); + else if ( type == UP_DEVICE_KIND_LINE_POWER ) + icon_name = g_strdup (XFPM_AC_ADAPTER_ICON); + else if ( type == UP_DEVICE_KIND_MONITOR ) + icon_name = g_strdup (XFPM_MONITOR_ICON); + else if ( type == UP_DEVICE_KIND_TABLET ) + icon_name = g_strdup (XFPM_TABLET_ICON); + else if ( type == UP_DEVICE_KIND_COMPUTER ) + icon_name = g_strdup (XFPM_COMPUTER_ICON); + /* As UPower does not tell us whether a system is a desktop or a laptop we + decide this based on whether there is a battery and/or a a lid */ + else if (!up_client_get_lid_is_present (upower) && + !up_client_get_on_battery (upower) && + g_strcmp0 (upower_icon, "battery-missing-symbolic") == 0) + icon_name = g_strdup (XFPM_AC_ADAPTER_ICON); + else if ( g_strcmp0 (upower_icon, "") != 0 ) + icon_name = g_strndup (upower_icon, icon_base_length); + return icon_name; } @@ -343,6 +258,11 @@ model = g_strdup (""); } + if (vendor == NULL) + vendor = g_strdup (""); + if (model == NULL) + model = g_strdup (""); + /* If we get a vendor or model we can use it, otherwise translate the * device type into something readable (works for things like ac_power) */ diff -Nru xfce4-power-manager-1.4.4/common/xfpm-power-common.h xfce4-power-manager-1.6.1/common/xfpm-power-common.h --- xfce4-power-manager-1.4.4/common/xfpm-power-common.h 2015-02-28 13:16:10.000000000 +0000 +++ xfce4-power-manager-1.6.1/common/xfpm-power-common.h 2017-11-23 23:52:06.000000000 +0000 @@ -21,8 +21,6 @@ #ifndef XFPM_UPOWER_COMMON #define XFPM_UPOWER_COMMON -#include - #define UPOWER_NAME "org.freedesktop.UPower" #define UPOWER_PATH "/org/freedesktop/UPower" @@ -49,12 +47,8 @@ const gchar *xfpm_power_translate_technology (guint value); -const gchar *G_GNUC_CONST xfpm_battery_get_icon_index (UpDeviceKind type, guint percent); - gchar *xfpm_battery_get_time_string (guint seconds); -gchar *xfpm_battery_get_icon_prefix_device_enum_type (UpDeviceKind type); - gchar *get_device_icon_name (UpClient *upower, UpDevice *device); gchar *get_device_description (UpClient *upower, UpDevice *device); diff -Nru xfce4-power-manager-1.4.4/compile xfce4-power-manager-1.6.1/compile --- xfce4-power-manager-1.4.4/compile 2015-03-22 11:30:38.000000000 +0000 +++ xfce4-power-manager-1.6.1/compile 2017-12-18 23:15:49.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -Nru xfce4-power-manager-1.4.4/config.guess xfce4-power-manager-1.6.1/config.guess --- xfce4-power-manager-1.4.4/config.guess 2015-03-22 11:30:38.000000000 +0000 +++ xfce4-power-manager-1.6.1/config.guess 2017-12-18 23:15:49.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2016-10-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 @@ -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-2016 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:*:*) @@ -878,7 +903,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 +926,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 +957,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 +972,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 +1000,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 +1035,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 +1057,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 +1136,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 +1285,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,9 +1301,9 @@ 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) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1285,7 +1325,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 @@ -1316,7 +1356,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 +1398,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 +1409,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-power-manager-1.4.4/config.h.in xfce4-power-manager-1.6.1/config.h.in --- xfce4-power-manager-1.4.4/config.h.in 2015-03-22 11:30:37.000000000 +0000 +++ xfce4-power-manager-1.6.1/config.h.in 2017-12-18 23:15:56.000000000 +0000 @@ -30,6 +30,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 @@ -57,18 +65,15 @@ /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM -/* Define if libxfce4panel-1.0 >= libxfce4panel_minimum_version present */ +/* Define if libX11 is available */ +#undef HAVE_LIBX11 + +/* Define if libxfce4panel-2.0 >= libxfce4panel_minimum_version present */ #undef HAVE_LIBXFCE4PANEL /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H -/* Define if lxpanel >= lxdepanel_minimum_version present */ -#undef HAVE_LXDEPANEL - -/* Define if lxpanel >= lxdepanel_new_minimum_version present */ -#undef HAVE_LXDEPANEL_NEW - /* Define to 1 if you have the header file. */ #undef HAVE_MATH_H @@ -132,14 +137,16 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_EXTENSIONS_SCRNSAVER_H + /* Define if XF86XK_Hibernate is available */ #undef HAVE_XF86XK_HIBERNATE /* Define if XF86XK_Suspend is available */ #undef HAVE_XF86XK_SUSPEND -/* 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 */ @@ -197,6 +204,9 @@ /* Short version string of xfce4-power-manager */ #undef XFPM_VERSION_SHORT +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + /* Define to 1 if on MINIX. */ #undef _MINIX diff -Nru xfce4-power-manager-1.4.4/config.sub xfce4-power-manager-1.6.1/config.sub --- xfce4-power-manager-1.4.4/config.sub 2015-03-22 11:30:38.000000000 +0000 +++ xfce4-power-manager-1.6.1/config.sub 2017-12-18 23:15:49.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2014-09-11' +timestamp='2016-11-04' # 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-2016 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,12 +254,13 @@ | 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 \ @@ -301,11 +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 \ @@ -313,6 +314,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -327,6 +329,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 @@ -372,12 +377,13 @@ | 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-* \ @@ -423,13 +429,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*-* \ @@ -437,6 +445,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -513,6 +522,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -633,6 +645,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 @@ -774,6 +794,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 @@ -1009,7 +1032,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-*) @@ -1019,7 +1042,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1365,18 +1388,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* \ | -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* \ @@ -1385,7 +1408,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*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1517,6 +1541,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) diff -Nru xfce4-power-manager-1.4.4/configure xfce4-power-manager-1.6.1/configure --- xfce4-power-manager-1.4.4/configure 2015-03-22 11:30:40.000000000 +0000 +++ xfce4-power-manager-1.6.1/configure 2017-12-18 23:15:50.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xfce4-power-manager 1.4.4. +# Generated by GNU Autoconf 2.69 for xfce4-power-manager 1.6.1. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='xfce4-power-manager' PACKAGE_TARNAME='xfce4-power-manager' -PACKAGE_VERSION='1.4.4' -PACKAGE_STRING='xfce4-power-manager 1.4.4' +PACKAGE_VERSION='1.6.1' +PACKAGE_STRING='xfce4-power-manager 1.6.1' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -639,26 +639,10 @@ PLATFORM_CFLAGS PLATFORM_CPPFLAGS BACKEND -BUILD_LXDE_OLD_PLUGIN_FALSE -BUILD_LXDE_OLD_PLUGIN_TRUE -BUILD_LXDE_NEW_PLUGIN_FALSE -BUILD_LXDE_NEW_PLUGIN_TRUE BUILD_XFCE_PLUGIN_FALSE BUILD_XFCE_PLUGIN_TRUE BUILD_PANEL_PLUGINS_FALSE BUILD_PANEL_PLUGINS_TRUE -HAVE_LXDEPANEL_FALSE -HAVE_LXDEPANEL_TRUE -LXDEPANEL_REQUIRED_VERSION -LXDEPANEL_LIBS -LXDEPANEL_CFLAGS -LXDEPANEL_VERSION -HAVE_LXDEPANEL_NEW_FALSE -HAVE_LXDEPANEL_NEW_TRUE -LXDEPANEL_NEW_REQUIRED_VERSION -LXDEPANEL_NEW_LIBS -LXDEPANEL_NEW_CFLAGS -LXDEPANEL_NEW_VERSION HAVE_LIBXFCE4PANEL_FALSE HAVE_LIBXFCE4PANEL_TRUE LIBXFCE4PANEL_REQUIRED_VERSION @@ -668,10 +652,6 @@ DPMS_LIBS ENABLE_POLKIT_FALSE ENABLE_POLKIT_TRUE -X11_REQUIRED_VERSION -X11_LIBS -X11_CFLAGS -X11_VERSION XRANDR_REQUIRED_VERSION XRANDR_LIBS XRANDR_CFLAGS @@ -696,14 +676,10 @@ XFCONF_LIBS XFCONF_CFLAGS XFCONF_VERSION -DBUS_GLIB_REQUIRED_VERSION -DBUS_GLIB_LIBS -DBUS_GLIB_CFLAGS -DBUS_GLIB_VERSION -DBUS_REQUIRED_VERSION -DBUS_LIBS -DBUS_CFLAGS -DBUS_VERSION +GIO_REQUIRED_VERSION +GIO_LIBS +GIO_CFLAGS +GIO_VERSION GMODULE_REQUIRED_VERSION GMODULE_LIBS GMODULE_CFLAGS @@ -727,6 +703,14 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +LIBX11_LIBS +LIBX11_LDFLAGS +LIBX11_CFLAGS +X_EXTRA_LIBS +X_LIBS +X_PRE_LIBS +X_CFLAGS +XMKMF XGETTEXT_ARGS MKINSTALLDIRS POSUB @@ -740,7 +724,9 @@ CATOBJEXT CATALOGS MSGFMT_OPTS +INTL_MACOSX_LIBS GETTEXT_PACKAGE +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -872,6 +858,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -903,14 +890,15 @@ enable_shared with_pic enable_fast_install +with_aix_soname with_sysroot enable_libtool_lock with_locales_dir +with_x enable_polkit enable_network_manager enable_panel_plugins enable_xfce4panel -enable_lxdepanel with_backend enable_debug ' @@ -923,6 +911,8 @@ LIBS CPPFLAGS CPP +LT_SYS_LIBRARY_PATH +XMKMF PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR' @@ -964,6 +954,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1216,6 +1207,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1353,7 +1353,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1466,7 +1466,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-power-manager 1.4.4 to adapt to many kinds of systems. +\`configure' configures xfce4-power-manager 1.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1506,6 +1506,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1529,6 +1530,10 @@ --program-suffix=SUFFIX append SUFFIX to installed program names --program-transform-name=PROGRAM run sed PROGRAM on installed program names +X features: + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR + System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] @@ -1537,7 +1542,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-power-manager 1.4.4:";; + short | recursive ) echo "Configuration of xfce4-power-manager 1.6.1:";; esac cat <<\_ACEOF @@ -1568,10 +1573,6 @@ Xfce's panel (default=[]) --disable-xfce4panel Disable checking for To build plugin support for Xfce's panel - --enable-lxdepanel Enable checking for To build plugin support for - LXDE's panel (default=[]) - --disable-lxdepanel Disable checking for To build plugin support for - LXDE's panel --enable-debug[=no|minimum|yes|full] Build with debugging support [default=[]] --disable-debug Include no debugging support @@ -1582,11 +1583,15 @@ --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-locales-dir=DIR Install locales into DIR + --with-x use the X Window System --with-backend=