diff -Nru thunar-volman-0.6.1/aclocal.m4 thunar-volman-0.8.1/aclocal.m4 --- thunar-volman-0.6.1/aclocal.m4 2012-03-28 16:34:45.000000000 +0000 +++ thunar-volman-0.8.1/aclocal.m4 2015-02-28 17:59:09.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. @@ -337,7 +337,6 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS @@ -457,10022 +456,10650 @@ fi]) +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, +dnl 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 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 They are *not* in the public domain. -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 41 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac +AC_PREREQ([2.50]) -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi +# 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. -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +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)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) +# 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 +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) -IT_PO_SUBDIR([po]) +# 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 +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -]) +pkg_failed=no +AC_MSG_CHECKING([for $1]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: +$$1_PKG_ERRORS -# 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. -# Written by Gordon Matzigkeit, 1996 -# -# 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. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# 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 -# 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. -]) +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -# serial 57 LT_INIT +_PKG_TEXT +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) +# 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. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) +# 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. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl +# 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. +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 -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# 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' +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], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) -_LT_SETUP +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.14.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -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-%%"` -]) +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# 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` +]) -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS +# AM_CONDITIONAL -*- Autoconf -*- +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # 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 - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Global variables: -ofile=libtool -can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -with_gnu_ld="$lt_cv_prog_gnu_ld" -old_CC="$CC" -old_CFLAGS="$CFLAGS" +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -_LT_CC_BASENAME([$compiler]) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) -# _LT_PROG_LTMAIN -# --------------- -# 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, -# 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" -])# _LT_PROG_LTMAIN +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -# 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' -# label. - +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) +# Generate code to set up dependency tracking. -*- Autoconf -*- -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _LT_CONFIG_LIBTOOL([COMMANDS]) +# _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS -# _LT_FORMAT_COMMENT([COMMENT]) +# AM_OUTPUT_DEPENDENCY_COMMANDS # ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) +# Do all the work for Automake. -*- Autoconf -*- +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O ]) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. 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 +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _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 -# 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"`']) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) +# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) +# Check to see how 'make' treats includes. -*- Autoconf -*- -# _LT_LIBTOOL_TAGS -# ---------------- -# 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 +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf ]) +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi ]) +# Helper functions for option handling. -*- Autoconf -*- -# _LT_LIBTOOL_CONFIG_VARS +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) # ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# 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], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# _LT_CONFIG_COMMANDS +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) # ------------------- -# 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 -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], 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=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_LT_OUTPUT_LIBTOOL_INIT +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# 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 -# 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). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD +# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -Usage: $[0] [[OPTIONS]] +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files +# Check how to create a tarball. -*- Autoconf -*- -Report bugs to ." +# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done + [pax], + [], -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF + [m4_fatal([Unknown tar format])]) -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" + AC_MSG_CHECKING([how to create a $1 tar archive]) -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# 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 && - 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 -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) -])# LT_OUTPUT + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_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 - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi + done + rm -rf conftest.dir - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -# `$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`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG -_LT_EOF +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 42 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl - 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 - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ;; - esac - - _LT_PROG_LTMAIN + *) + ;; +esac - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi - _LT_PROG_REPLACE_SHELLFNS +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) +IT_PO_SUBDIR([po]) -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG +]) -m4_ifndef([AC_PROG_GO], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# 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 +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) +m4_define([_LT_COPYING], [dnl +# 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. -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. +# +# 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 this program. If not, see . +]) -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) +# serial 58 LT_INIT -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[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 +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS=$ltmain -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl - 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 - # 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 - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - 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 - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) +_LT_SETUP - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _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 - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _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' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +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 - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; 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' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _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\"`' - 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" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; 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}" - 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}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi +# _LT_CC_BASENAME(CC) +# ------------------- +# 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], +[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_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# 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 - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _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" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi -])# _LT_SYS_MODULE_PATH_AIX - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# 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). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +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 -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' +_LT_CONFIG_LIBTOOL_INIT([ +# 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 + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST fi -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} +_LT_CHECK_OBJDIR -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac +m4_require([_LT_TAG_COMPILER])dnl -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) +case $host_os in +aix3*) + # 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 set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH +# Global variables: +ofile=libtool +can_build_shared=yes +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a -# _LT_WITH_SYSROOT -# ---------------- -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).], -[], [with_sysroot=no]) +with_gnu_ld=$lt_cv_prog_gnu_ld -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 #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac +old_CC=$CC +old_CFLAGS=$CFLAGS - 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.])]) +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +_LT_CC_BASENAME([$compiler]) -# 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. - 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" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC fi - rm -rf conftest* ;; +esac -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - 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 - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - 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" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [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 - # 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 - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) +# _LT_PROG_LTMAIN +# --------------- +# 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, +# 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 +])# _LT_PROG_LTMAIN -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) +# 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' +# label. -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) -])# _LT_CMD_OLD_ARCHIVE +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$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" - # 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 - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) ]) -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - 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 - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) ]) -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # 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` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - 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` - ;; +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$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 - 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` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) +# _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 +# 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"`']) -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" -#if HAVE_DLFCN_H -#include -#endif +# _LT_LIBTOOL_TAGS +# ---------------- +# 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 +]) -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# 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], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - return status; -}] -_LT_EOF - 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 - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; +# _LT_CONFIG_COMMANDS +# ------------------- +# 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 +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # 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_libs= - lt_cv_dlopen_self=yes - ]) - ;; +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [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"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], 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\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) +_LT_OUTPUT_LIBTOOL_INIT +]) - if test "x$lt_cv_dlopen_self" = xyes; 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 - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# 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 +# 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). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test 0 = "$lt_write_fail" && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF +lt_cl_help="\ +'$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) +Usage: $[0] [[OPTIONS]] + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +Report bugs to ." - lt_compiler_flag="-o out/conftest2.$ac_objext" - # 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 - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) +while test 0 != $[#] +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; 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 - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - 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]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try '$[0] --help' for more information.]) ;; + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try '$[0] --help' for more information.]) ;; + esac + shift +done -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_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.]) -])# _LT_CHECK_OBJDIR - +_LTEOF -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_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 +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # 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 - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# 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 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 +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_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 that allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB + cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL +# Generated automatically by $as_me ($PACKAGE) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +_LT_COPYING +_LT_LIBTOOL_TAGS + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_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 -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - 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" ;; - 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 - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + 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 set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF ;; esac - # Ok, now we have the path, separated by spaces, we can step through it - # 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` - 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 - 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; - 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; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # 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'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown + _LT_PROG_LTMAIN -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' - shlibpath_var=LIBPATH + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" -aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - 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 - # 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 - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not 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 - # 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 - # 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 - shlibpath_var=LIBPATH - fi - ;; +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`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' - ;; - esac - ;; -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) -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' - 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" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) - case $GCC,$cc_basename in - yes,*) - # 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'\''`~ - 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' - shlibpath_overrides_runpath=yes - 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}' -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}' - ;; - 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}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - 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" - 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'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG - # 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'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - 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' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - 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}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - 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 - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - 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' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - 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' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) -interix[[3-9]]*) - 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' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - 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}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - 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}" - hardcode_into_libs=yes - ;; +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - # 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 +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} - # Append ld.so.conf contents 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" - fi +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER -netbsd*) - version_type=sunos - 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' - 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' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -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}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE -*nto* | *qnx*) - 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' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ 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 - else - shlibpath_overrides_runpath=yes - fi - ;; + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; + 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 + # 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 + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + 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 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) -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}' - 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" - ;; + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS=$save_LDFLAGS + ]) -rdos*) - dynamic_linker=no - ;; + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _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 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 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _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' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + 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' + fi + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; -sunos4*) - version_type=sunos - 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 - need_lib_prefix=no +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + 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 - need_version=yes - ;; - -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' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined + case $cc_basename in + ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; esac - ;; - -sysv4*MP*) - 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' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - 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' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + 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" + m4_if([$1], [CXX], +[ 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 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac + _LT_TAGVAR(ld_shlibs, $1)=no fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - 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}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -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' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; 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" -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" +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# 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 set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _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 + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) fi +])# _LT_SYS_MODULE_PATH_AIX -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [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_SYS_DYNAMIC_LINKER +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which 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_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" - test -z "$ac_dir" && ac_dir=. - 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" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# 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 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 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - AC_MSG_RESULT(no) + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} +case $ECHO in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac -# _LT_PATH_MAGIC -# -------------- -# find a file program which 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 - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl -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], - [with_gnu_ld=no])dnl +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], +[], [with_sysroot=no]) -ac_prog=ld -if test "$GCC" = yes; 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 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - 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" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; 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 - for ac_dir in $PATH; do - 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" - # 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 /dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([$with_sysroot]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac -# Old names: -AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) -AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_LD], []) -dnl AC_DEFUN([AC_PROG_LD], []) + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and where our libraries should be installed.])]) +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test no = "$enable_libtool_lock" || enable_libtool_lock=yes -# _LT_PATH_LD_GNU -#- -------------- -m4_defun([_LT_PATH_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; + *ELF-64*) + HPUX_IA64_MODE=64 + ;; + esac + fi + rm -rf conftest* ;; -esac]) -with_gnu_ld=$lt_cv_prog_gnu_ld -])# _LT_PATH_LD_GNU - - -# _LT_CMD_RELOAD -# -------------- -# find reload flag for linker -# -- PORTME Some linkers may need a different reload flag. -m4_defun([_LT_CMD_RELOAD], -[AC_CACHE_CHECK([for $LD option to reload object files], - lt_cv_ld_reload_flag, - [lt_cv_ld_reload_flag='-r']) -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +*-*-irix6*) + # 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 yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac else - reload_cmds='$LD$reload_flag -o $output$reload_objs' + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac fi - ;; -esac -_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_TAGDECL([], [reload_cmds], [2])dnl -])# _LT_CMD_RELOAD - - -# _LT_CHECK_MAGIC_METHOD -# ---------------------- -# how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_MAGIC_METHOD], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -AC_CACHE_CHECK([how to recognize dependent libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# 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. -# '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. - -case $host_os in -aix[[4-9]]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[[45]]*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # 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 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' fi + rm -rf conftest* ;; -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; +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 - else - lt_cv_deplibs_check_method=pass_all + 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* ;; -gnu*) - lt_cv_deplibs_check_method=pass_all +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # 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 + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* ;; -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + 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 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 + fi ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' +*-*solaris*) + # 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 + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + 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 + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* ;; +esac -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; +need_locks=$enable_libtool_lock +])# _LT_ENABLE_LOCK -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [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 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 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; +if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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)$' - fi - ;; -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all +if test -n "$RANLIB"; then + case $host_os in + bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; - pc) - lt_cv_deplibs_check_method=pass_all + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - ;; + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$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" ## 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 + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* ]) -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac +if test yes = "[$]$2"; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) fi +])# _LT_COMPILER_OPTION -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + 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 + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +]) -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - 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 - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - 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 - # Check to see if the nm accepts a BSD-compat flag. - # 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'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - 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 yes = "[$]$2"; then + m4_if([$4], , :, [$4]) 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 - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi + m4_if([$5], , :, [$5]) fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM +])# _LT_LINKER_OPTION -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' -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 - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring=ABCD + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M + 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` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + 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` + ;; -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + 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 + 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 + 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` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +]) +if test -n "$lt_cv_sys_max_cmd_len"; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes = "$cross_compiling"; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac +#if HAVE_DLFCN_H +#include +#endif -# 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'" +#include -# 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'" +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do +/* 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)) +int fnord () __attribute__((visibility("default"))); +#endif - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; - # 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. - # 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};"\ -" \$ 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))}"\ -" ' prfx=^$ac_symprfx]" + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + puts (dlerror ()); + + return status; +}] +_LT_EOF + 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 + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - 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 - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif + case $host_os in + beos*) + lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -#ifdef __cplusplus -extern "C" { -#endif + mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + cygwin*) + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; - cat <<_LT_EOF >> conftest.$ac_ext + darwin*) + # 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_libs= + lt_cv_dlopen_self=yes + ]) + ;; -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; + 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 + ;; -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen=shl_load], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen=dlopen], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], + [AC_CHECK_LIB([svld], [dlopen], + [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]) + ]) + ]) + ]) + ]) + ]) + ;; + esac -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - 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 - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 + enable_dlopen=yes fi - rm -rf conftest* conftst* - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi + save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [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_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_file_list_spec], [1], - [Specify filename containing input files for $NM]) -]) # _LT_CMD_GLOBAL_SYMBOLS + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= + 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 + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + ;; + esac - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | 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). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - 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' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | 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']) - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - 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_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # 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' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _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* | pgcpp*) - # Portland Group 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)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # 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 + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +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 + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + 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 no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) + need_locks=warn fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_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 where libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; + # We can hardcode non-existent directories. + 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 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 + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; +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 yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - 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). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB - 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' - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; +# _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 - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +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 yes = "$GCC"; then + case $host_os in + 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' ;; + 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 + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # 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` + # ...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" + 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; + 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; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # 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'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=.so +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; +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' + shlibpath_var=LIBPATH - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='$libname$release$shared_ext$major' + ;; - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + 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' + shlibpath_var=LD_LIBRARY_PATH else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + # 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 + # 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 + : else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + can_build_shared=no fi ;; + esac + # 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 - 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']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - 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' + 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. + 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' ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + 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' ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # 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' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - 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' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Intel*\ [[CF]]*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' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - esac + 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 + ;; - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`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 + ;; - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; +beos*) + library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +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' + 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" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; + case $GCC,$cc_basename in + yes,*) + # 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'\''`~ + 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' + shlibpath_overrides_runpath=yes - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + 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' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi + 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' ;; + esac + dynamic_linker='Win32 ld.exe' + ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + 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'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") ;; esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= + + # 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'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; + *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' ;; -esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + 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' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $version_type in + freebsd-elf*) + 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' + need_version=yes + ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; + esac + shlibpath_var=LD_LIBRARY_PATH 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". - 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' + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + 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 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 - _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' + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + 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' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + shrext_cmds='.sl' + 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' ;; esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # 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'. - _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 - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +irix5* | irix6* | nonstopux*) case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # 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 - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes + nonstopux*) version_type=nonstopux ;; + *) + 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 + fi ;; + 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' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= ;; - openbsd*) - with_gnu_ld=no + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac ;; 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" + hardcode_into_libs=yes + ;; - _LT_TAGVAR(ld_shlibs, $1)=yes +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; - # 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 - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac +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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # 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 + + # 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" fi - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; - # 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' - # 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' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 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 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac +netbsd*) + version_type=sunos + 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' + 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' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 +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' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. +*nto* | *qnx*) + 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' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; -_LT_EOF - fi - ;; +openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + 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 + ;; - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; +os2*) + libname_spec='$name' + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + # 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=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' + ;; - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; +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' + 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 + ;; - cygwin* | mingw* | pw32* | cegcc*) - # _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(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + 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 yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes + ;; - 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' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi +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' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes + siemens) + need_lib_prefix=no ;; - - 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' - # 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' + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ;; + esac + ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; 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 - 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' - 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' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--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(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(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' +sysv4*MP*) + 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' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; - if test "x$supports_anon_versioning" = xyes; 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' - fi +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + 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' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + 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' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; - case $cc_basename in - 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(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; 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' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + 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' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _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' - fi - ;; +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' + shlibpath_var=LD_LIBRARY_PATH + ;; - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test no = "$dynamic_linker" && can_build_shared=no -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi -_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' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; +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 - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 +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 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** 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 -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # 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' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; +# ... 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" - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - *) - 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' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [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], [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 - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # 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 - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; 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="" - 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". - 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' - 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' - fi - aix_use_runtimelinking=no +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# 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_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 + test -z "$ac_dir" && ac_dir=. + 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 + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org - # 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. - 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 - aix_use_runtimelinking=yes - break - fi - done - ;; +_LT_EOF + fi ;; esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' fi + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac]) +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _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,' - if test "$GCC" = yes; 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` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; 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' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi +# _LT_PATH_MAGIC +# -------------- +# 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 + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC - _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 - # 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" - else - if test "$host_cpu" = ia64; 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" - 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" - # 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 - # 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' - 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' - fi - fi - ;; - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test no = "$withval" || with_gnu_ld=yes], + [with_gnu_ld=no])dnl - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - 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=' - # 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 - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # 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' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - 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. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +ac_prog=ld +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 + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + 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 + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +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 + for ac_dir in $PATH; do + 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 + # 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 &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 - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _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}+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' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (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)='$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']) - ;; - esac - fi - if test "$with_gnu_ld" = no; 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(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +# _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 - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - 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' - # 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" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - 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' - fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _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 - ;; +# _LT_CHECK_MAGIC_METHOD +# ---------------------- +# how to check for library dependencies +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_MAGIC_METHOD], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +AC_CACHE_CHECK([how to recognize dependent libraries], +lt_cv_deplibs_check_method, +[lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# 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. +# '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 +# 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]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[[45]]*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # 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. + 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 + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; - 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_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; - *nto* | *qnx*) - ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; - openbsd*) - 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 - _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' - 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 - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; - os2*) - _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' - ;; +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; - 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' - 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' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; - 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' - 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_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' +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; - 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' - _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' - 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_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' - ;; - *) - 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' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - 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 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' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; - sunos4*) - if test "x$host_vendor" = xsequent; 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' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +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)$' + fi + ;; - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _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' +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown - 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' - 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' - fi - ;; +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT 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(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_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _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' - 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_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM +else + 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 + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + 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 + # Check to see if the nm accepts a BSD-compat flag. + # 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 + # 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 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac fi + done + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} +fi]) +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 -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(ld_shlibs, $1)=no + DUMPBIN=: ;; esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _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 - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + AC_SUBST([DUMPBIN]) + if test : != "$DUMPBIN"; then + NM=$DUMPBIN + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" fi - ;; -esac + rm -f conftest*]) +])# LT_PATH_NM -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_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 - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [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 - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# 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'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # 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 + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -# Source file extension for C test sources. -ac_ext=c +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC +# _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 -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM=-lm) + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && 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 - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - 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 - AC_MSG_RESULT([$enable_static]) +if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac - _LT_CONFIG($1) + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# 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'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])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 - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi +m4_require([_LT_TAG_COMPILER])dnl -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] -# Source file extension for C++ test sources. -ac_ext=cpp +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test ia64 = "$host_cpu"; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + 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"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" -# No sense in running all these tests if we already determined that -# 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 - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" +# Transform an extracted symbol line into symbol name and symbol address +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'" - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX + # 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, + # 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=\"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 - $as_unset lt_cv_path_LD + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - 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 - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi + # Check to see that the pipe works correctly. + pipe_works=no - if test "$GXX" = yes; then - # Set up default GNU C++ configuration + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF - LT_PATH_LD + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi - # 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' + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + 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 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +#ifdef __cplusplus +extern "C" { +#endif - # 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}' +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - # 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' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= + cat <<_LT_EOF >> conftest.$ac_ext - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; - # 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"' +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + 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 + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi else - GXX=no - with_gnu_ld=no - wlarc= + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; 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="" - 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. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac + # Do not use the global_symbol_pipe unless it works. + if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [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 - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _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,' - if test "$GXX" = yes; 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` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; 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' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= - _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 - # 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" +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - _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" - else - if test "$host_cpu" = ia64; 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" - 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" - # 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 - # 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' - 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' - fi - fi + case $host_os in + aix*) + # All AIX code is PIC. + 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*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; + esac + ;; - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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' + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | 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). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--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 + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else - _LT_TAGVAR(ld_shlibs, $1)=no + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' fi ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - 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=' - # 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' - ;; - *) - # 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(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' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) + mingw* | cygwin* | os2* | pw32* | 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']) ;; - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; - ghcx*) + ghcx*) # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no + *) ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - + esac + ;; freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) - _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(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _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' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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"' - ;; - *) - 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' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; 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' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + 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 ia64 != "$host_cpu"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi ;; - aCC*) + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' 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' - ;; - 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}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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"' ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; 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' - ;; - 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}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi + *) ;; - esac - ;; - - 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' - # 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' + esac ;; - 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' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. ;; - *) - 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' - 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' - 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_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # 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' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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"' - - _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. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # 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' - ;; - *) # 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' - ;; - 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' + ecpc* ) + # 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' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _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* | pgcpp*) + # Portland Group 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)='-Bstatic' ;; - 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`"' - _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' - _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' - _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' - ;; - *) # 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' - ;; - 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' - ;; 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' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - 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(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' - fi + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in *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(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(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ;; esac ;; esac ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ;; *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no ;; esac ;; - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + 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 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*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + 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). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--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 + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + 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 + ;; - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes + 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 + ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default ;; - - openbsd*) - 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' - fi - output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ;; + 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' + ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - 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)=' -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_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' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # 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' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + 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' + ;; + 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) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*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' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; 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 $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 + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; - # 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"' + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # 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_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' + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # 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' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - output_verbose_link_cmd='func_echo_all' + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - 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' + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - # 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 $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_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' + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac - # 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 - # 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_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' +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - # 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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) - _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' - ;; - esac - fi - ;; - esac - ;; +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _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 -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 +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + 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 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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _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 + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ;; + esac + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # 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'. + _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 + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT 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(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_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # 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 yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd* | bitrig*) + with_gnu_ld=no + ;; + esac - 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(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_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' - ;; - esac - ;; + _LT_TAGVAR(ld_shlibs, $1)=yes - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no + # 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 yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes ;; - esac - ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; + if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='$wl' - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; + # 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' + # 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' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + 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 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; esac - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) +_LT_EOF + fi + ;; - _LT_CONFIG($1) - fi # test -n "$compiler" + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - 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 + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG + cygwin* | mingw* | pw32* | cegcc*) + # _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(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _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, 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 + ;; -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -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}\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $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 + ;; -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF -]) + 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' + # 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' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + 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 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' + 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' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + 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(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(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_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac + 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' + fi -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. + 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(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $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~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _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' + fi + ;; - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - 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 - -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}" - else - _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 - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - prev= - ;; +_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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _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" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; +*** 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 +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. - *) ;; # Ignore the rest. +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # 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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + 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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; esac - done - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi + 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)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # 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 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 + fi + ;; -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS + aix[[4-9]]*) + 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= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _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 -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # 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 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 + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _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,' + 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 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` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + 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 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 yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi -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 + _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,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 -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 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" + 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" + # 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 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' + 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 + _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 ;; - 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 + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac ;; - 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 -]) + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -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!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + 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,-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 + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # 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' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + 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. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# 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'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Source file extension for f77 test sources. -ac_ext=f + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# No sense in running all these tests if we already determined that -# 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 - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" + hpux9*) + 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 "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_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" + # 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' + ;; - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER + hpux10*) + 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 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' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE + hpux11*) + 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' + ;; + 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+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' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (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)='$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']) + ;; + esac + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; - # 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 - 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 + irix5* | irix6* | nonstopux*) + 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" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + 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 - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - 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 - AC_MSG_RESULT([$enable_static]) + 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' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _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 + ;; - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + 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 + ;; - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - _LT_CONFIG($1) - fi # test -n "$compiler" + 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_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + *nto* | *qnx*) + ;; -AC_LANG_POP -])# _LT_LANG_F77_CONFIG + 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__`"; 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' + else + _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 + fi + ;; + 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 + ;; -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# 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'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) + osf3*) + 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' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi + osf4* | osf5*) # as osf3* with the addition of -msym flag + 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_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' -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + 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' + 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_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' + ;; + *) + 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' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + 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 is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + 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 + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext + sunos4*) + 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' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# No sense in running all these tests if we already determined that -# 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 - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _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' - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu + 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' + fi + ;; - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) + sysv5* | sco3.2v5* | sco5v6*) + # 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(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_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) + 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' + fi + ;; - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=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 - 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 - fi - ;; + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; esac - AC_MSG_RESULT([$enable_shared]) - 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 - AC_MSG_RESULT([$enable_static]) + if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) - _LT_CONFIG($1) - fi # test -n "$compiler" +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes + 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. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -AC_LANG_POP -])# _LT_LANG_FC_CONFIG + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_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 + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [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 + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# 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'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# 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'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC=$CC +AC_LANG_PUSH(C) -# Source file extension for Java test sources. -ac_ext=java +# Source file extension for C test sources. +ac_ext=c -# Object file extension for compiled Java test sources. +# Object file extension for compiled C test sources. objext=o _LT_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' +lt_simple_link_test_code='int main(){return(0);}' -# ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC # save warnings/boilerplate of simple test code _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - if test -n "$compiler"; then _LT_COMPILER_NO_RTTI($1) _LT_COMPILER_PIC($1) _LT_COMPILER_C_O($1) _LT_COMPILER_FILE_LOCKS($1) _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB - _LT_CONFIG($1) -fi + # Report what library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) -AC_LANG_RESTORE + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no -GCC=$lt_save_GCC + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + 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 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 + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG +])# _LT_LANG_C_CONFIG -# _LT_LANG_GO_CONFIG([TAG]) +# _LT_LANG_CXX_CONFIG([TAG]) # -------------------------- -# 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'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE +# 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'. +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 no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi -# Source file extension for Go test sources. -ac_ext=go +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -# Object file extension for compiled Go test sources. +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. objext=o _LT_TAGVAR(objext, $1)=$objext -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" +# No sense in running all these tests if we already determined that +# 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 yes != "$_lt_caught_CXX_error"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + 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 -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + if test yes = "$GXX"; then + # Set up default GNU C++ configuration -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) + LT_PATH_LD - _LT_CONFIG($1) -fi + # 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 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' -AC_LANG_RESTORE + _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' + + # 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' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # 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 + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + 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= + 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 + # 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 + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + 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 + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _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,' + 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 -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# 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'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE + 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` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + 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 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 yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi -# Source file extension for RC test sources. -ac_ext=rc + _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,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. + # 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" -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext + _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 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" + 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" + # 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 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' + 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 + _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 + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _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' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + 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,-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' + ;; + *) + # 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(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + 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, 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 + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $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 + ;; -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[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" - AC_SUBST(GCJFLAGS)])])[]dnl -]) + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + haiku*) + _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_separator, $1)=: + _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 + # location of the library. -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _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 "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. + # + # There doesn't appear to be a way to prevent this compiler from + # 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"' + ;; + *) + 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 + fi + ;; + esac + ;; + hpux10*|hpux11*) + 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_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + 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' + ;; + 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+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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"' + ;; + *) + 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' + ;; + 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+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + 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' + # 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' + ;; + 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_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + 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' + 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_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) + # 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' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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"' -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # 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' + ;; + *) # 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' + ;; + 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' + ;; + 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`"' + _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' + _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' + _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' + ;; + *) # 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' + ;; + esac -m4_ifndef([AC_PROG_SED], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # + _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' -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# 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 - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $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 - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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' + ;; + 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 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' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *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(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(compiler_needs_object, $1)=yes + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# 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']) + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# _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=: -]) + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; -# _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 + 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__`"; 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 + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which 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], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl + # 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' -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac -]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008, 2009 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. + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + 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)=' -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_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' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac -# serial 7 ltoptions.m4 + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # 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"' + ;; + *) + 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 $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_separator, $1)=: + + # 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 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + solaris*) + case $cc_basename in + CC* | sunCC*) + # 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_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' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # 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' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[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 -]) + output_verbose_link_cmd='func_echo_all' + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + 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_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + # 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 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 $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 $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 + # platform. + _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 $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) + # 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 -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' + 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' + ;; + esac + fi + ;; + esac + ;; -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _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' -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - 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 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_SET_OPTIONS + 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 -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 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(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_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _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(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_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' + ;; + esac + ;; -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_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.]) -]) + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + _LT_CONFIG($1) + fi # test -n "$compiler" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + 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 yes != "$_lt_caught_CXX_error" -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + 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 -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. -# _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'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test x-L = "$p" || + test x-R = "$p"; then + prev=$p + continue + fi -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + 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 + else + _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 + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)=$prev$p + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" + fi + fi + prev= + ;; -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + if test no = "$pre_test_object_deps_done"; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _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 + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) + *) ;; # Ignore the rest. + + esac + done + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS -# _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'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; +esac +]) - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +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!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# 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'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test no = "$F77"; then + _lt_disable_F77=yes +fi -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +# Source file extension for f77 test sources. +ac_ext=f -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext +# No sense in running all these tests if we already determined that +# 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 yes != "$_lt_disable_F77"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" -# _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'. -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], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - 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," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_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.]) -]) + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no -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.]) -]) + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + 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 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 + AC_MSG_RESULT([$enable_shared]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD -# _LT_WITH_PIC([MODE]) -# -------------------- -# 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'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [pic_mode=default]) + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + _LT_CONFIG($1) + fi # test -n "$compiler" -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) +AC_LANG_POP +])# _LT_LANG_F77_CONFIG -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_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.]) -]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# 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'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) +if test -z "$FC" || test no = "$FC"; then + _lt_disable_FC=yes +fi -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 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. +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# 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 yes != "$_lt_disable_FC"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" -# serial 6 ltsugar.m4 + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# 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])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) + AC_MSG_CHECKING([whether to build shared libraries]) + 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 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 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 + AC_MSG_RESULT([$enable_shared]) -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# 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 -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is 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 + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + _LT_CONFIG($1) + fi # test -n "$compiler" + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_FC" -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) +AC_LANG_POP +])# _LT_LANG_FC_CONFIG -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# 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'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE +# Source file extension for Java test sources. +ac_ext=java -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 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. +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -# @configure_input@ +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) -# serial 3337 ltversion.m4 -# This file is part of GNU Libtool + _LT_CONFIG($1) +fi -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +AC_LANG_RESTORE -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. -# Written by Scott James Remnant, 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 5 lt~obsolete.m4 +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# 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'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# 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. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# 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. -# -# 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 -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. +# Source file extension for Go test sources. +ac_ext=go -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl 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 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 They are *not* in the public domain. +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE -AC_PREREQ([2.50]) +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no -# 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. +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -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)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + _LT_CONFIG($1) fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]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 -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +AC_LANG_RESTORE -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# 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'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE -# 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 -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# Source file extension for RC test sources. +ac_ext=rc -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +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 + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) -$$1_PKG_ERRORS +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) -_PKG_TEXT -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) -# serial 1 -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# 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.11' -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.11.3], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) ]) -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])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 -*- +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) -# serial 1 +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. +m4_ifndef([AC_PROG_SED], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # -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` +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# 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 + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $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 10 -lt "$lt_ac_count" && break + lt_ac_count=`expr $lt_ac_count + 1` + if test "$lt_ac_count" -gt "$lt_ac_max"; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done ]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) -# serial 9 -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset else - $1_TRUE='#' - $1_FALSE= + lt_unset=false fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# 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], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. +# Helper functions for option handling. -*- Autoconf -*- # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +# 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. -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +# serial 8 ltoptions.m4 -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[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 ]) -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) -#serial 5 +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + 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 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_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) + ]) +])# _LT_SET_OPTIONS -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_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.]) +]) -# serial 8 +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac -# serial 16 +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'win32-dll' option into LT_INIT's first parameter.]) +]) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _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'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. 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 -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 1 +# _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'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) -# serial 2 +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) -# serial 5 -# AM_MAINTAINER_MODE([DEFAULT-MODE]) + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) +# 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], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + 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, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL -# Check to see how 'make' treats includes. -*- Autoconf -*- +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_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.]) +]) -# serial 4 +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.]) +]) -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +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 ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +*) + with_aix_soname=aix + ;; +esac -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +_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])]) -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 6 +# _LT_WITH_PIC([MODE]) +# -------------------- +# 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'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do + IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [pic_mode=m4_default([$1], [default])]) -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_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.]) ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) -# serial 1 -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) -# Helper functions for option handling. -*- Autoconf -*- +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# 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 unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# 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 5 +# serial 6 ltsugar.m4 -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# 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])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# 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 +# than defined and empty). # -# 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. +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) -# serial 1 -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 5 +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) + +# ltversion.m4 -- version numbers -*- Autoconf -*- # -# 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 1 - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006, 2008, 2010 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 unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# 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 3 +# @configure_input@ -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +# serial 4179 ltversion.m4 +# This file is part of GNU Libtool -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) -# Check how to create a tarball. -*- Autoconf -*- +AC_DEFUN([LTVERSION_VERSION], +[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) +]) -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# 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. +# 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 +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. -# serial 2 +# serial 5 lt~obsolete.m4 -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# These exist entirely to fool aclocal when bootstrapping libtool. # -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar +# 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. # -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# 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. +# +# 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 +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -dnl $Id$ -dnl -dnl Copyright (c) 2002-2006 +dnl Copyright (c) 2002-2015 dnl The Xfce development team. All rights reserved. dnl dnl Written for Xfce by Benedikt Meurer . @@ -10500,7 +11127,7 @@ dnl We need recent a autoconf version -AC_PREREQ([2.53]) +AC_PREREQ([2.60]) @@ -10674,30 +11301,6 @@ -dnl BM_DEPEND(varname, package, version) -dnl -dnl Simple wrapper for XDT_CHECK_PACKAGE("varname", "package", "version"). Kept -dnl for backward compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_DEPEND], -[ - XDT_CHECK_PACKAGE([$1], [$2], [$3]) -]) - - - -dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default) -dnl -dnl Simple wrapper for XDT_CHECK_OPTIONAL_PACKAGE(). Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_DEPEND_CHECK], -[ - XDT_CHECK_OPTIONAL_PACKAGE([$1], [$2], [$3], [$4], [$5], [$6]) -]) - - - dnl XDT_CHECK_LIBX11() dnl dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS @@ -10834,69 +11437,7 @@ ]) - -dnl BM_LIBX11() -dnl -dnl Simple wrapper for XDT_CHECK_LIBX11. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBX11], -[ - AC_REQUIRE([XDT_CHECK_LIBX11]) -]) - - - -dnl BM_LIBX11_REQUIRE() -dnl -dnl Simple wrapper for XDT_CHECK_LIBX11_REQUIRE. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBX11_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE]) -]) - - - -dnl BM_LIBSM() -dnl -dnl Simple wrapper for XDT_CHECK_LIBSM. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBSM], -[ - AC_REQUIRE([XDT_CHECK_LIBSM]) -]) - - - -dnl BM_LIBXPM -dnl -dnl Simple wrapper for XDT_CHECK_LIBXPM. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBXPM], -[ - AC_REQUIRE([XDT_CHECK_LIBXPM]) -]) - - - -dnl BM_LIBXPM_REQUIRE -dnl -dnl Simple wrapper for XDT_CHECK_LIBXPM_REQUIRE. Kept for -dnl backward compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBXPM_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBXPM_REQUIRE]) -]) - - -dnl $Id$ -dnl -dnl Copyright (c) 2002-2006 +dnl Copyright (c) 2002-2015 dnl The Xfce development team. All rights reserved. dnl dnl Written for Xfce by Benedikt Meurer . @@ -10924,7 +11465,7 @@ dnl We need recent a autoconf version -AC_PREREQ([2.53]) +AC_PREREQ([2.60]) dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS) @@ -10938,7 +11479,7 @@ AC_MSG_CHECKING([if $CC supports $flag]) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) CFLAGS="$saved_CFLAGS" AC_MSG_RESULT([$flag_supported]) @@ -10972,10 +11513,10 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs" - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + -Wnested-externs" + CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" @@ -11015,7 +11556,7 @@ CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" AC_MSG_RESULT([no]) else AC_MSG_RESULT([minimum]) @@ -11042,7 +11583,7 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $xdt_vis_test_cflags" AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE( + AC_COMPILE_IFELSE([AC_LANG_SOURCE( [ void test_default (void); void test_hidden (void); @@ -11055,7 +11596,7 @@ test_hidden (); return 0; } - ]), + ])], [ have_gnuc_visibility=yes AC_MSG_RESULT([yes]) @@ -11116,87 +11657,7 @@ fi ]) -dnl BM_DEBUG_SUPPORT() -dnl -AC_DEFUN([BM_DEBUG_SUPPORT], -[ -dnl # --enable-debug - AC_REQUIRE([XDT_FEATURE_DEBUG]) - -dnl # --enable-profiling - AC_ARG_ENABLE([profiling], -AC_HELP_STRING([--enable-profiling], - [Generate extra code to write profile information]) -AC_HELP_STRING([--disable-profiling], - [No extra code for profiling (default)]), - [], [enable_profiling=no]) - - AC_MSG_CHECKING([whether to build with profiling support]) - if test x"$enable_profiling" != x"no"; then - CFLAGS="$CFLAGS -pg" - LDFLAGS="$LDFLAGS -pg" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - -dnl # --enable-gcov - AC_ARG_ENABLE([gcov], -AC_HELP_STRING([--enable-gcov], - [compile with coverage profiling instrumentation (gcc only)]) -AC_HELP_STRING([--disable-gcov], - [do not generate coverage profiling instrumentation (default)]), - [], [enable_gcov=no]) - - AC_MSG_CHECKING([whether to compile with coverage profiling instrumentation]) - if test x"$enable_gcov" != x"no"; then - CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - -dnl # --disable-asserts - AC_ARG_ENABLE([asserts], -AC_HELP_STRING([--disable-asserts], [Disable assertions [DANGEROUS]]), - [], [enable_asserts=yes]) - - AC_MSG_CHECKING([whether to disable assertions]) - if test x"$enable_asserts" = x"no"; then - AC_MSG_RESULT([yes]) - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT" - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS" - else - AC_MSG_RESULT([no]) - fi - -dnl # --enable-final - AC_REQUIRE([AC_PROG_LD]) - AC_ARG_ENABLE([final], -AC_HELP_STRING([--enable-final], [Build final version]), - [], [enable_final=yes]) - - AC_MSG_CHECKING([whether to build final version]) - if test x"$enable_final" = x"yes"; then - AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([whether $LD accepts -O1]) - case `$LD -O1 -v 2>&1 . @@ -11272,16 +11733,3 @@ ]) - -dnl BM_I18N(PACKAGE, LINGUAS) -dnl -dnl Simple wrapper for XDT_I18N(LINGUAS, PACKAGE). Kept for -dnl backward compatibility. Will be removed in the -dnl future. -dnl -AC_DEFUN([BM_I18N], -[ - XDT_I18N([$2], [$1]) -]) - - diff -Nru thunar-volman-0.6.1/ChangeLog thunar-volman-0.8.1/ChangeLog --- thunar-volman-0.6.1/ChangeLog 2012-03-28 16:34:51.000000000 +0000 +++ thunar-volman-0.8.1/ChangeLog 2015-02-28 17:59:22.000000000 +0000 @@ -1,16 +1,1922 @@ -commit 97f1084da60de38670c666c24ac3de2fe7bb3733 +commit d230504d7384e17290172ab8a6ed8965de598dd0 +Author: Harald Judt +Date: Sat Feb 28 18:53:45 2015 +0100 + + Updates for release + +commit f3f8ba9d92923492d93672676dffc5f65c068ea9 +Author: Matias De lellis +Date: Wed Aug 29 15:08:07 2012 -0300 + + Workaround: Wait 5 second before mounting devices (bug #9193) + + This is obviously only a workaround that will get reverted when a proper + solution has been found, whatever that will look like. At least it gets + thunar-volman functional again. + +commit 8d3cc36034cefa5f4f5edd0b90d0a8cbedbadf8f +Author: Harald Judt +Date: Thu Feb 26 16:15:12 2015 +0100 + + Use new show help function instead of thunar help (bug #10204) + +commit a22a0e553fe475e65c0800b06ebc35589f044557 +Author: Harald Judt +Date: Thu Feb 26 14:52:46 2015 +0100 + + Fix AC_CONFIG_MACRO_DIR warning + +commit 5c89d8b1daabd8011d38434f93695c4a3c5ed035 +Author: Harald Judt +Date: Thu Feb 26 14:48:02 2015 +0100 + + Remove SVN $Id$ and update .gitignore + +commit 87c3a09a646b45fe17fba67403fc859a1e0fa9fc +Author: Harald Judt +Date: Thu Feb 26 14:33:31 2015 +0100 + + Bump autotools versions + +commit 0a95304b9b05455ac72fff35debfda8ac8d428be +Author: Harald Judt +Date: Thu Feb 26 14:29:46 2015 +0100 + + Fix AC_PROG_INTLTOOL warning + + xdt-autogen: It is recommended to use IT_PROG_INTLTOOL([0.35.0]) + in your configure.ac file and remove AC_PROG_INTLTOOL + + See http://bugzilla.xfce.org/show_bug.cgi?id=8930 for + more information. + +commit b0b4d68acc015fadfe2bcf9da6c8c34003ab13b4 +Author: GenghisKhan +Date: Thu Feb 26 12:30:43 2015 +0100 + + I18n: Update translation he (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ec1dff00a57f9d9be0f76b0a31bed7d193781ac9 +Author: Anonymous +Date: Mon Feb 23 12:31:01 2015 +0100 + + I18n: Update translation bg (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f11bec141109ab58370a4929f439b7893ecd024d +Author: enolp +Date: Mon Feb 23 06:30:46 2015 +0100 + + I18n: Update translation ast (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit daf849d22cdcc30c28fcefee91e2e174e5201dee +Author: Manolo Díaz +Date: Sun Feb 22 00:30:38 2015 +0100 + + I18n: Update translation es (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4ac64ac576361f94bde6c4fa96c9ff72a0e2fc6c +Author: Slavko +Date: Sat Feb 21 12:30:31 2015 +0100 + + I18n: Update translation sk (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5d277ef16eb045698268794da54174906b1529d3 +Author: Mișu Moldovan +Date: Sun Feb 15 18:30:33 2015 +0100 + + I18n: Update translation ro (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7ed0247cbf91190f722b5f272635fb0ee4e2a4c4 +Author: Sergey Alyoshin +Date: Sun Feb 8 18:30:40 2015 +0100 + + I18n: Update translation ru (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f02f7c946546f5994280569aa811b923eebdb0eb +Author: Efstathios Iosifidis +Date: Sat Dec 27 00:30:45 2014 +0100 + + I18n: Update translation el (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 29ae1697ed755d1a1dfbaebe8f5752f342cbb8ab +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Fri Dec 26 12:30:46 2014 +0100 + + I18n: Update translation es (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 55b56e8834275bcb6452470affff43488ad7f270 +Author: enolp +Date: Sun Dec 14 00:30:31 2014 +0100 + + I18n: Update translation ast (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b9ad2e5418b215b97b9bff356d871ba6f1a9a1b4 +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Tue Dec 2 06:30:40 2014 +0100 + + I18n: Update translation es (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 46a14fd36ff14102b386a30363522b27ff73911b +Author: Ḷḷumex03 +Date: Fri Nov 14 06:30:23 2014 +0100 + + I18n: Update translation ast (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cdfe05930cef941d047a7db703e5799e87ecf063 +Author: Anonymous +Date: Thu Sep 18 00:30:27 2014 +0200 + + I18n: Update translation de (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cc105262ce8cff22e0b65e70dc17ef715baf2f56 +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Mon Sep 8 18:30:28 2014 +0200 + + I18n: Update translation es (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 036ac26fef673c637ce1e9d82d232b26e9ecbe1c +Author: Pasi Lallinaho +Date: Sat Aug 23 00:30:26 2014 +0200 + + I18n: Update translation fi (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit eeed158ca80e821824f7d5d129ea06ec8136f7bf +Author: Urien Desterres +Date: Fri Aug 22 00:30:25 2014 +0200 + + I18n: Update translation fr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 37d3e73c1594245601bf4e728470771fd5c511ff +Author: Yannick Le Guen +Date: Thu Jul 17 18:30:24 2014 +0200 + + I18n: Update translation fr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3ac026ef55e6fff6bcd6431eee57c2a5e83fe909 +Author: Yannick Le Guen +Date: Thu Jul 17 12:30:24 2014 +0200 + + I18n: Update translation fr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f6de38f911882d57e1a7bc4b4178f73a8fcf3237 +Author: OSWorld +Date: Mon Jun 2 00:30:50 2014 +0200 + + I18n: Update translation pl (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 61d6ce303af5b7387d04cbdb8751242652b45529 +Author: Tornes Llume +Date: Thu May 15 18:30:23 2014 +0200 + + I18n: Update translation ast (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 53c201b53e795af03a2f2d607ba8666227350621 +Author: kingu +Date: Sat May 10 18:30:31 2014 +0200 + + I18n: Update translation nb (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1ea2eb88e95a6c4ce95affb375c64b36b55ea732 +Author: haarek +Date: Sun Apr 27 00:30:22 2014 +0200 + + I18n: Update translation nb (95%). + + 108 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 33d74a3b54716ec766cd8169014e7810e29772d6 +Author: Urides +Date: Thu Apr 17 18:30:25 2014 +0200 + + I18n: Update translation fr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d43808c49ef744fca3865786f7d883f75cde6558 +Author: Tornes Llume +Date: Sat Apr 12 18:30:24 2014 +0200 + + I18n: Update translation ast (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c6d6911cafa61ef27dac40e7ba245a5602420ce1 +Author: Tornes Llume +Date: Sat Apr 12 06:30:29 2014 +0200 + + I18n: Update translation ast (62%). + + 71 translated messages, 42 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 28c96a1a22ef707c9c0d68366bf732cd4890beb3 +Author: Adolfo Jayme Barrientos +Date: Mon Mar 31 00:30:24 2014 +0200 + + I18n: Update translation es (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 61eaeda11a674808131b737f5938aee657bd70cb +Author: Pablo Lezaeta +Date: Fri Mar 28 12:30:33 2014 +0100 + + I18n: Update translation es (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 47a1d6f68b50dc349278847ca4c03191ad4b20ab +Author: truongap +Date: Fri Mar 7 06:30:25 2014 +0100 + + I18n: Update translation vi (67%). + + 76 translated messages, 37 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 41963bbb999fea318c2ab6cfa75d36086a273203 +Author: truongap +Date: Thu Mar 6 06:30:25 2014 +0100 + + I18n: Add new translation vi (63%). + + 72 translated messages, 41 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cdebee4251e4c6b26b1ad4bd66de92a83e8438f6 +Author: PavelNicklasson +Date: Mon Feb 24 00:30:28 2014 +0100 + + I18n: Update translation sv (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 02ae80f1d9f724ef1fc6ac33e22bf11440fd19ba +Author: schizo +Date: Fri Feb 21 18:30:31 2014 +0100 + + I18n: Update translation hr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit dd2de8cd491ff69bd22c4d37f2bbbcd112cfe27f +Author: padmawan +Date: Sat Jan 25 12:30:24 2014 +0100 + + I18n: Update translation id (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 88596548eb23a89be39b491b31e65b5f9d72bc6c +Author: Anonymous +Date: Mon Dec 30 00:30:26 2013 +0100 + + I18n: Update translation de (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 64ad7958d41ec3ef3bf01b9cb8085399ee78ca3d +Author: Anonymous +Date: Thu Dec 26 06:30:24 2013 +0100 + + I18n: Update translation ug (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c45486bab325c86ef4008e7e4bfbfeed69d23e0c +Author: Masato HASHIMOTO +Date: Sun Dec 8 18:30:27 2013 +0100 + + I18n: Update translation ja (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9fc37ff2ea7fc8487155ffa58df66ddd5f982d82 +Author: Xfce +Date: Tue Nov 19 18:39:39 2013 +0100 + + I18n: Update translation ur (60%). + + 68 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit be2983761bfb176107d77e0e5538df5909ad1503 +Author: Xfce +Date: Tue Nov 19 18:39:39 2013 +0100 + + I18n: Update translation ur_PK (60%). + + 68 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9cfb079d2991d7e9b31ebe04829f0034370a1955 +Author: Xfce +Date: Tue Nov 19 18:39:33 2013 +0100 + + I18n: Update translation ug (99%). + + 112 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9c189a238a9aa1e71c84c4b5ce34d0c168a9f6b7 +Author: Xfce +Date: Tue Nov 19 18:39:32 2013 +0100 + + I18n: Update translation te (80%). + + 91 translated messages, 22 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 955ba13ce57166fa96b26f85fa3df9a588be3d52 +Author: Xfce +Date: Tue Nov 19 18:39:31 2013 +0100 + + I18n: Update translation sq (60%). + + 68 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8613babd4b279cdc5c90e339427ff9b57f0cc383 +Author: Xfce +Date: Tue Nov 19 18:39:31 2013 +0100 + + I18n: Update translation sk (95%). + + 108 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f0006f70e05c15021336e1f79980074a36436b97 +Author: Xfce +Date: Tue Nov 19 18:39:30 2013 +0100 + + I18n: Update translation ro (99%). + + 112 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1912c7a61c6e8f2ed7e583a208eafb074cd29914 +Author: Xfce +Date: Tue Nov 19 18:39:30 2013 +0100 + + I18n: Update translation nn (95%). + + 108 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c9800b1b54ed532547c7c0bbe8dc69fabce31e14 +Author: Xfce +Date: Tue Nov 19 18:39:29 2013 +0100 + + I18n: Update translation nb (60%). + + 68 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 998a1b53a88fcde45357287eeccdad3ef8e1b6d5 +Author: Xfce +Date: Tue Nov 19 18:39:29 2013 +0100 + + I18n: Update translation lv (60%). + + 68 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b83aa360022ae767e2c90af02e3c9730572a7c8e +Author: Xfce +Date: Tue Nov 19 18:39:29 2013 +0100 + + I18n: Update translation lt (95%). + + 108 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a7ed928db49e1eee2b8137ae7e18f655d05a8d7e +Author: Xfce +Date: Tue Nov 19 18:39:28 2013 +0100 + + I18n: Update translation ja (99%). + + 112 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 033df81ab616b9f7730f9ec465aa0213f40dbbbd +Author: Xfce +Date: Tue Nov 19 18:39:28 2013 +0100 + + I18n: Update translation id (99%). + + 112 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 175ba3c2a4c4f9c46c0f212538ca3c4055181c00 +Author: Xfce +Date: Tue Nov 19 18:39:27 2013 +0100 + + I18n: Update translation gl (99%). + + 112 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 233695895abcb8f16e7a768876ea5c29fc25874a +Author: Xfce +Date: Tue Nov 19 18:39:27 2013 +0100 + + I18n: Update translation eu (99%). + + 112 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 68b18bc90395482a0ff29b4b3a0a03214aaddee0 +Author: Pablo Lezaeta +Date: Tue Nov 19 18:39:27 2013 +0100 + + I18n: Update translation es (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5b3390b0b71259d45d6c90e6f185aaa7e53a8ca6 +Author: Xfce +Date: Tue Nov 19 18:39:27 2013 +0100 + + I18n: Update translation en_GB (99%). + + 112 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0bbe8390adf511ea58d85de94d93c56780855012 +Author: Xfce +Date: Tue Nov 19 18:39:27 2013 +0100 + + I18n: Update translation el (95%). + + 108 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3f2d670f6d6c72286f058550dc7b3592d631aa31 +Author: Xfce +Date: Tue Nov 19 18:39:26 2013 +0100 + + I18n: Update translation de (95%). + + 108 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f332528d28aaa6e09309c74a574901880378b636 +Author: Xfce +Date: Tue Nov 19 18:39:26 2013 +0100 + + I18n: Update translation ca (99%). + + 112 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 680835494f26ecc6315d962dafea4d912c8306d4 +Author: Xfce +Date: Tue Nov 19 18:39:26 2013 +0100 + + I18n: Update translation ast (60%). + + 68 translated messages, 45 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9126ba6b43e6e4a02bfdba8d987470bd6e45f477 +Author: Cedric31 +Date: Mon Nov 18 18:30:25 2013 +0100 + + I18n: Add new translation oc (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b290c4aa73876c4048e12e702f10ec101bd79a0e +Author: FredN +Date: Sun Nov 17 12:30:23 2013 +0100 + + I18n: Update translation sv (95%). + + 108 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 71ad69e3d84fc2e9a9769c19202442a77b41e6fd +Author: Puretech +Date: Thu Nov 14 12:30:26 2013 +0100 + + I18n: Add new translation ms (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c12fce39f44b6f870890361a7270d078c83dd70a +Author: Jiri Grönroos +Date: Tue Nov 12 00:30:28 2013 +0100 + + I18n: Update translation fi (97%). + + 110 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6d4402a632056b331bc7947cf13d6683b30be4eb +Author: Aputsiaĸ Niels Janussen +Date: Fri Nov 8 18:30:29 2013 +0100 + + I18n: Update translation da (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit aed4404d7d74fc6342a81eb1689829f8b62ccefe +Author: Yaron Shahrabani +Date: Wed Nov 6 12:30:26 2013 +0100 + + I18n: Update translation he (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4935649ce7d90f90e5f1031aa242e4dbf5e21d8d +Author: theppitak +Date: Mon Nov 4 18:30:24 2013 +0100 + + I18n: Add new translation th (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 87a48d6f9efe64b6befd957cf0d6a4df2f01918d +Author: Sveinn í Felli +Date: Sat Nov 2 12:30:24 2013 +0100 + + I18n: Update translation is (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b3ff13ea52715532261e9326e67d846a456c6446 +Author: Ivica Kolić +Date: Sun Oct 20 00:30:24 2013 +0200 + + I18n: Update translation hr (87%). + + 99 translated messages, 14 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit da32af5a788172cfd901b437e012727b5fb7f48d +Author: Chipong +Date: Thu Oct 17 18:30:23 2013 +0200 + + I18n: Update translation zh_CN (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cf515153e3d1b2aa3168c5230fa41943f9976b5a +Author: Sveinn í Felli +Date: Tue Oct 15 18:30:24 2013 +0200 + + I18n: Update translation is (75%). + + 85 translated messages, 28 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 727be28f2f73084b321bcc95f0e806bd52311c59 +Author: Walter Cheuk +Date: Sat Oct 12 18:30:26 2013 +0200 + + I18n: Add new translation zh_HK (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9ea5589ee34689850425796ebecaadecf95a6546 +Author: Cheng-Chia Tseng +Date: Tue Oct 8 18:30:23 2013 +0200 + + I18n: Update translation zh_TW (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 283f6869223d7023aff45ba337f199476b5423ce +Author: Michal Várady +Date: Sat Oct 5 12:30:22 2013 +0200 + + I18n: Update translation cs (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 437e49b6723b0e708eaf3ada33e73e9c47552a83 +Author: Nucleo +Date: Fri Oct 4 06:30:22 2013 +0200 + + I18n: Update translation hu (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 791d2757b9653fa6ab0f7c692075a21b7c535c16 +Author: Fatih Erdem <93.fatiherdem@gmail.com> +Date: Mon Sep 30 18:30:25 2013 +0200 + + I18n: Update translation tr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3ad6f510dc50ebe55e4cb85c8f38f0b9db492ea4 +Author: mohammad alhargan +Date: Mon Sep 30 12:30:21 2013 +0200 + + I18n: Update translation ar (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a25b4465ef6a13a71f60a57f85b6fb235e5a966b +Author: nunom +Date: Sun Sep 29 18:30:23 2013 +0200 + + I18n: Update translation pt (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1ac270f5568ab5a0c934a3b7d02f4be23c9bd6e3 +Author: Yarema aka Knedlyk +Date: Sun Sep 29 00:30:22 2013 +0200 + + I18n: Update translation uk (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 620d2e0e721ba7bbe893adbe51fe21c9b56d8e0b +Author: Piotr Strębski +Date: Wed Sep 25 12:30:23 2013 +0200 + + I18n: Update translation pl (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7bec141d6e846a98f21971188235f3a0c0cb8d26 +Author: Baurzhan Muftakhidinov +Date: Wed Sep 25 06:30:22 2013 +0200 + + I18n: Update translation kk (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e9879c3099b53fe1791bd9669bb5280a0350c327 +Author: Klemen Košir +Date: Tue Sep 24 18:30:22 2013 +0200 + + I18n: Update translation sl (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 25602aea587ca94a254632ae98a7144acc12e917 +Author: cri +Date: Tue Sep 24 12:30:23 2013 +0200 + + I18n: Update translation it (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6a1b07356f5a9d82981853c9bc61fafc9b3aa62a +Author: Rafael Ferreira +Date: Mon Sep 23 00:30:22 2013 +0200 + + I18n: Update translation pt_BR (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b4f86ed9d3a2ccf4fe8bc76e0157f666365cb05d +Author: jc1 +Date: Mon Sep 23 00:30:22 2013 +0200 + + I18n: Update translation fr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 255cc2050aefc3d6843cc51ca33c953feccacfbe +Author: asvl +Date: Sun Sep 22 18:30:22 2013 +0200 + + I18n: Update translation ru (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b4885292c5624f1b65ec6ffb3bf74eee9c302a8a +Author: Pjotr123 +Date: Sun Sep 22 12:30:24 2013 +0200 + + I18n: Update translation nl (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9cceab72fa0615e7743f49f7b2b57a7938cce88e +Author: k3lt01 +Date: Sun Sep 22 12:30:24 2013 +0200 + + I18n: Update translation en_AU (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3c338ffa35d28b005fff3850aec645c48c9a655d +Author: salepetronije +Date: Sun Sep 22 00:30:22 2013 +0200 + + I18n: Update translation sr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 93a26bc24fb2dd53013ac97c53a855eaf2563a25 +Author: Darkcircle +Date: Sat Sep 21 12:30:24 2013 +0200 + + I18n: Update translation ko (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit edcfe892226609be33facf7b80dfafc08885a98b +Author: cybercop +Date: Sat Sep 21 12:30:24 2013 +0200 + + I18n: Update translation bg (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1321aa637c18e9f93e8114af81feac53d398bd2f +Author: Nick Schermer +Date: Fri Sep 20 20:13:31 2013 +0200 + + Fix typo. + +commit d511330a6fa1973739aa76a77d2b10ff3e0fa9ad +Author: cri +Date: Fri Sep 20 00:30:23 2013 +0200 + + I18n: Update translation it (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b5e2548f369d3669a3abc2f6e9682a1107bcfb7c +Author: Pjotr123 +Date: Thu Sep 19 18:30:32 2013 +0200 + + I18n: Update translation nl (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 59d4cc15f082805c6cbd8ea3662e3a6c088b66e3 +Author: Ivica Kolić +Date: Tue Sep 10 00:30:31 2013 +0200 + + I18n: Update translation hr (81%). + + 92 translated messages, 21 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f81a4fb5926a0368cf223bc799a2ad33bfec00be +Author: jc1 +Date: Mon Jul 29 18:30:31 2013 +0200 + + I18n: Update translation fr (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fca04dcd2c9032d7f07aa93135a0ca2aee1ae4c6 +Author: k3lt01 +Date: Mon Jul 29 12:30:40 2013 +0200 + + I18n: Add new translation en_AU (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6df43452fcb7549db4dd7b06bfaa73797344fa9a +Author: Noskcaj +Date: Wed Jul 24 00:30:28 2013 +0200 + + I18n: Update translation en_GB (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 82b842f911fe8c3ecb2607828df62fbfe75fd1d8 +Author: OSWorld +Date: Wed Jul 17 12:30:34 2013 +0200 + + I18n: Update translation pl (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5a8947168150e1f6bcb0c904ec4a8246e97537af +Author: Nick Schermer +Date: Sat Jul 13 22:09:19 2013 +0200 + + Remove unneeded files. + +commit 565d30256dca231ac5f8025dc53eeead7cdaa225 +Author: carlesmu +Date: Mon Jul 8 12:30:30 2013 +0200 + + I18n: Update translation ca (100%). + + 113 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c6164e95c1e3401e83a8711f59d02671a60032e8 +Author: Neliton Pereira Junior +Date: Mon Jun 10 18:57:19 2013 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 88ffb61fe51c221d4e27541b588b1af1f4bdf899 +Author: Klemen Košir +Date: Mon May 13 22:14:34 2013 +0200 + + l10n: Updated Slovenian (sl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0d47baf28c521b69cb1d4280c8222be1d85fc314 +Author: Klemen Košir +Date: Mon May 13 18:22:11 2013 +0200 + + l10n: Updated Slovenian (sl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cc0c8605f0caf16110b40b793f07eaa31da6f177 +Author: Klemen Košir +Date: Sun May 12 16:27:34 2013 +0200 + + l10n: Updated Slovenian (sl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7b6be842c342a12bbded92f0dafd8a878f3c6349 +Author: Klemen Košir +Date: Sat May 11 13:44:36 2013 +0200 + + l10n: Updated Slovenian (sl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1294171cd6f52c5e5d519b8e7bd80eaa26e81b78 +Author: Pjotr vertaalt +Date: Fri Apr 26 21:40:59 2013 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9cfb90960f80f7fa1ccc1939862d5e6185539d9e +Author: Pjotr vertaalt +Date: Thu Apr 25 19:04:44 2013 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 19ef34bb3fb9edf2b5067362c322efb1a81c7335 +Author: Mișu Moldovan +Date: Sun Apr 14 18:42:10 2013 +0200 + + l10n: Updated Romanian (ro) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 38816dbc40cd826299d5ce8a0d1932f1cbb6f6a6 +Author: Seong-ho Cho +Date: Fri Apr 12 19:22:36 2013 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2932df202ae9db7fdc12a674851fcc0fe9f7b41d +Author: Саша Петровић +Date: Sun Mar 24 11:24:47 2013 +0100 + + l10n: Updated Serbian (sr) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8f02a89824b78bbeea940709658d8254d88242ef +Author: Ardjuna +Date: Sat Mar 23 16:12:44 2013 +0100 + + l10n: Updated Indonesian (id) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4423fab1f950002ec865da46705441322a9a5d24 +Author: Piarres Beobide +Date: Sun Feb 24 20:12:29 2013 +0100 + + l10n: Updated Basque (eu) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d1e4f0455e4999b0e9aa616110c1292380cf702a +Author: كريم أولاد الشلحة +Date: Tue Feb 5 20:43:17 2013 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3ba6595495b90e1553136bb5859423012bb5fa73 +Author: كريم أولاد الشلحة +Date: Sat Feb 2 13:44:21 2013 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 364ae0525f926096ddea0956d994bdfeb9ee0e92 +Author: Cheng-Chia Tseng +Date: Mon Jan 28 04:12:39 2013 +0100 + + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 37677b6f20189f748a48c6a726bda8720688ac44 +Author: Michal Várady +Date: Sun Jan 27 18:54:37 2013 +0100 + + l10n: Updated Czech (cs) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e6de3ee3b8749a4c374c027ddd8f17a3a662783e +Author: Kiril Kirilov +Date: Sun Jan 27 12:44:25 2013 +0100 + + l10n: Updated Bulgarian (bg) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 535f400bdfe919c9505084e5430f3aec17d44709 +Author: Kiril Kirilov +Date: Sun Jan 27 12:27:35 2013 +0100 + + l10n: Updated Bulgarian (bg) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c2c9ed4ddbb7e9df8193874410bb15dccd32c6a2 +Author: Gheyret Kenji +Date: Fri Jan 25 02:24:13 2013 +0100 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 75cd249b24eb3aa529c5242b4faea56173bc0c38 +Author: Gabor Kelemen +Date: Mon Jan 21 00:09:06 2013 +0100 + + l10n: Updated Hungarian (hu) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 45a583bcf8f4198236b945206a518d57fa01909f +Author: Nenad Latinović +Date: Sun Jan 20 13:25:01 2013 +0100 + + l10n: Updated Slovenian (sl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3503a799ea35dc4b0485529b7244e7a14abbe6c8 +Author: Nenad Latinović +Date: Sun Jan 20 13:21:53 2013 +0100 + + l10n: Slovene translation + + New status: 112 messages complete with 0 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c0d6408c5e8b244e9b0f3e876e47ab428781d02e +Author: Nick Schermer +Date: Sun Jan 6 12:19:52 2013 +0100 + + Autotools updates. + +commit 007685cf1a1d5b645dc55abaeba618c0117c0c61 +Author: Per Kongstad +Date: Sat Jan 5 17:17:05 2013 +0100 + + l10n: Updated Danish (da) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d19a92276fd6a011357b72e0d4c0f710022a3797 +Author: Саша Петровић +Date: Mon Dec 31 09:18:22 2012 +0100 + + l10n: Updated Serbian (sr) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0de202174ab6aa3dfa2d75b32aca9927d80d18c5 +Author: Roman K +Date: Thu Dec 27 12:04:52 2012 +0100 + + l10n: Updated Russian (ru) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 35ca8f7af5d7d5ff176042a1a22d878c40a5aaf9 +Author: Piotr Sokół +Date: Sun Dec 23 23:19:04 2012 +0100 + + l10n: Updated Polish (pl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 30079720cc0f7a628df037a46f37d7259be03a35 +Author: Chipong Luo +Date: Sun Dec 23 12:40:50 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a34b4d77daa72ba8d26365e2f32dd8313865e387 +Author: Baurzhan Muftakhidinov +Date: Thu Dec 20 13:31:26 2012 +0100 + + l10n: Updated Kazakh (kk) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 988bbf431264722af852900094d0f82d8b582040 +Author: Yarema aka Knedlyk +Date: Mon Dec 17 14:14:58 2012 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 510851a96d3cecf25775d365b38130f221101d87 +Author: Yarema aka Knedlyk +Date: Mon Dec 17 14:13:29 2012 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3dca45e645822555e6ac80435ea29d0f46bdcc1a +Author: jc jc1 +Date: Sat Dec 15 17:09:17 2012 +0100 + + l10n: Updated French (fr) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 651e93b9d9704f7311e65d6c7204cac2e6b6b49f +Author: Masato Hashimoto +Date: Thu Dec 13 14:42:07 2012 +0100 + + l10n: Updated Japanese (ja) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1f33728c7e81be2754fde4471ce235aa6cb953d8 +Author: Ivica Kolić +Date: Thu Dec 13 01:20:06 2012 +0100 + + l10n: Updated Croatian (hr) translation to 81% + + New status: 92 messages complete with 0 fuzzies and 21 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 70c526483b2c589b7c57e962b32bb5dc1314fa38 +Author: Ivica Kolić +Date: Thu Dec 13 01:18:57 2012 +0100 + + l10n: Updated Croatian (hr) translation to 81% + + New status: 92 messages complete with 0 fuzzies and 21 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5a0b2851300cd413aba689f31567e11d6aa8f849 +Author: Rafael Ferreira +Date: Wed Dec 12 13:35:32 2012 +0100 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit eff2e1a39b36cefb014b2573a3d92c1e4ecac23a +Author: Seong-ho Cho +Date: Wed Dec 12 11:04:35 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7025893f4efd562cd0a46f79adc68c7039a0724e +Author: Seong-ho Cho +Date: Wed Dec 12 11:03:52 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f889b7f9e8bc7496368e78de4698fead009157c5 +Author: prflr88 +Date: Tue Dec 11 20:34:38 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cbce0bba9b55d340382b0a21d6d501096bec56dd +Author: Cristian Marchi +Date: Mon Dec 10 21:40:15 2012 +0100 + + l10n: Updated Italian (it) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3d204364b82350735113c686e7d215f7f025c069 +Author: Sergio Marques +Date: Mon Dec 10 15:40:04 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 64009f491651b1d2ee95b8bc2bce2c226f3c7b3b +Author: Yarema aka Knedlyk +Date: Mon Dec 10 14:06:26 2012 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit babd8e3e74926fc4c7a9845c873b6465b249f40a +Author: Pjotr vertaalt +Date: Mon Dec 10 11:15:37 2012 +0100 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 337b272bf5c55753bae76546b4f85a5bd249f7c8 +Author: Nick Schermer +Date: Sun Dec 9 21:13:44 2012 +0100 + + Print a bit more info what type is not supported. + +commit 460e37dbb0936e25f13f433ac24e1fd4c81cc5e5 +Author: Nick Schermer +Date: Sun Dec 9 21:13:36 2012 +0100 + + Enable silent rules. + +commit 5d718273e091cb6b8d0bc77543bbd78a24a08c67 +Author: Nick Schermer +Date: Sun Dec 9 21:13:17 2012 +0100 + + Don't use deprecated API. + +commit 5d99cd2ab3b9cf90c04c14ac60d8e771c0f274d9 +Author: Yaron Shahrabani +Date: Fri Nov 30 17:03:16 2012 +0100 + + l10n: Updated Hebrew (he) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8e06da2bfcb11052c6d85319b21a644706f6d0d5 +Author: Seong-ho Cho +Date: Sun Nov 18 06:09:57 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3d86e2d322c17c2a826a867d869a3ff0e623faa6 +Author: محمد الحرقان +Date: Sun Nov 18 04:31:07 2012 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 077464341d8ff216f302264898c1a23fdf954d29 +Author: Yaron Shahrabani +Date: Sun Nov 4 08:05:24 2012 +0100 + + l10n: Updated Hebrew (he) translation to 28% + + New status: 32 messages complete with 0 fuzzies and 81 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 022542732a315cb18f323d04d3d39247f3074ea6 +Author: Yaron Shahrabani +Date: Sun Nov 4 08:01:40 2012 +0100 + + l10n: Hebrew translation + + New status: 25 messages complete with 0 fuzzies and 88 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2d333dbf4c7d61eae302fb6db91709ce8c0931b5 +Author: Gheyret Kenji +Date: Wed Oct 24 05:55:29 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1e63661e44b5fd87e42171724e6a7d47e5130fa2 +Author: Gheyret Kenji +Date: Wed Oct 24 05:15:06 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4f5077541b227f3275744eafabdfb00dfdc6e604 +Author: Francisco Javier Serrador +Date: Sat Oct 13 22:42:23 2012 +0200 + + l10n: Updated Spanish (Castilian) (es) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4b5bce032a1148d0e439e97c991caa547aa2f17c +Author: Gheyret Kenji +Date: Mon Jul 16 08:15:59 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e41acdd51626b44b31c7950f81accea46a0e43f4 +Author: Gheyret Kenji +Date: Fri Jul 13 02:51:31 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6f69ed9b425ea3f566eae4df9a3779856c7eb057 +Author: Мирослав Николић +Date: Thu Jul 5 11:32:55 2012 +0200 + + l10n: New Serbian translation + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2947a994091df80163d27f5b2ac6b8d78dc2f0ea +Author: Sveinn í Felli +Date: Fri Jun 29 22:43:38 2012 +0200 + + l10n: Updated Icelandic (is) translation to 35% + + New status: 40 messages complete with 0 fuzzies and 73 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9a0e3459833a602679f02b5b6aecb8a26f840776 +Author: Gheyret Kenji +Date: Thu May 31 07:28:44 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 116 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9afc9e98de224e82a5a346b431bfd08bda72dc0c +Author: Andrei Zakharevich +Date: Fri May 4 19:28:27 2012 +0200 + + l10n: Updated Belarusian (be) translation to 24% + + New status: 28 messages complete with 0 fuzzies and 85 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b3bceedc3a332b8453865df23eec3cba2d5e2af9 +Author: Yarema aka Knedlyk +Date: Tue May 1 23:25:04 2012 +0200 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d7a3e6af7581c20cfc76a57c2185e76891ae2cae Author: Nick Schermer -Date: Wed Mar 28 18:34:41 2012 +0200 +Date: Sat Apr 28 22:19:41 2012 +0200 + + Post release tag bump. + +commit 07190512773bd8f3b0b74f077073f51ab0a1e1dc +Author: Nick Schermer +Date: Sat Apr 28 22:18:28 2012 +0200 Updates for release. -commit c86efb561af977da4006b1fcefca0b1925bbe54f +commit 40e345b67c57cd42ef4b8070fcc403d345250ae7 +Author: Mișu Moldovan +Date: Fri Apr 27 23:44:23 2012 +0200 + + l10n: Updated Romanian (ro) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c25bbdcee526e77ae0dd3357a947f47c84a7c329 +Author: Masato Hashimoto +Date: Wed Apr 25 13:43:35 2012 +0200 + + l10n: Updated Japanese (ja) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 85bc674222968795a03f0cd4d687c667b8f4318a +Author: Chipong Luo +Date: Mon Apr 23 14:30:28 2012 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c4eaf262faf7a1c4e0d6e6e4b2d91be2887a169f +Author: Mișu Moldovan +Date: Fri Apr 20 16:17:46 2012 +0200 + + l10n: Updated Romanian (ro) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 165640ad7e9861cf31a099a9d0a4378a6025efd2 +Author: Chipong Luo +Date: Fri Apr 20 14:55:00 2012 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 224c1a79fd845b674a229319089782b90f63a03e +Author: Jeff Bailes +Date: Thu Apr 19 08:19:30 2012 +0200 + + l10n: Updated English (United Kingdom) (en_GB) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6a85adbce5c6475b98185e4fcdcb8312ecd5a1f1 +Author: Seong-ho Cho +Date: Tue Apr 17 15:34:44 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ce4c5132d8e254d7c21e61af5b211c9fd4933ce4 +Author: Pjotr Anon +Date: Tue Apr 17 11:56:31 2012 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b88b018bab825a98e8da89dd36dee35c8f32512e +Author: Henrique P. Machado +Date: Sun Apr 15 19:36:46 2012 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 55a071be0cafbf8a5d8d1e64976ed41918747c04 +Author: Nick Schermer +Date: Sat Apr 14 00:42:30 2012 +0200 + + Post release tag bump. + +commit f070457d0244f082770584a187b0de89e503a50d Author: Nick Schermer -Date: Wed Mar 28 18:31:53 2012 +0200 +Date: Sat Apr 14 00:41:35 2012 +0200 + + Updates for release. + +commit acfcb67d9155b495f343cee2f13b47fc6206e188 +Author: Seong-ho Cho +Date: Fri Apr 13 14:08:31 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 015946edce236b1b93af2b4b06195a82a24242a2 +Author: Seong-ho Cho +Date: Fri Apr 13 14:06:41 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 37ce179b49304c360e10073a693e3b59717413c3 +Author: Seong-ho Cho +Date: Fri Apr 13 14:05:01 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 80125010b5b5051be764ee54f556b39710c8c254 +Author: Nuno Miguel +Date: Fri Apr 13 13:22:26 2012 +0200 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). - Revert "Drop AC_PROG_LIBTOOL/AC_DISABLE_STATIC for LT_PREREQ and LT_INIT." +commit def589c6575f9b1595bf0e089d53b9c0095af69a +Author: Jari Rahkonen +Date: Thu Apr 12 10:17:08 2012 +0200 + + l10n: Updated Finnish (fi) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit db32e84706c11d630eaf9f4ca054e01dc490a171 +Author: Sergio Marques +Date: Wed Apr 11 15:49:50 2012 +0200 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f547c43bd397d7c9dbd50aa86aa137d7cb76c0b6 +Author: Sergio Marques +Date: Wed Apr 11 15:49:30 2012 +0200 + + l10n: Updated Portuguese (pt) translation to 99% + + New status: 112 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0ce9efeac61ca8e97cb37ef5ffc9ed4ecd4ebe83 +Author: Masato Hashimoto +Date: Wed Apr 11 14:45:15 2012 +0200 + + l10n: Updated Japanese (ja) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8a39f839e9e8b18c98642cf34cce4d19edfbf985 +Author: Nuno Miguel +Date: Tue Apr 10 19:35:35 2012 +0200 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 116 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3833038efec5b8ab4d59791dd78bba096f7f92e4 +Author: Leandro Regueiro +Date: Tue Apr 10 12:55:33 2012 +0200 + + l10n: Updated Galician (gl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0ebbed14c9b94deed5876747e543cef8e707600c +Author: Alper Tekinalp +Date: Mon Apr 9 21:33:52 2012 +0200 + + l10n: Updated Turkish (tr) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f9237be09fc6784b254a4cb42815babe6ec6c4a3 +Author: Efstathios Iosifidis +Date: Mon Apr 9 18:33:00 2012 +0200 + + l10n: Updated Greek (el) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 648141af5483b7d20d9e1ded9e6247f47fd7c9ef +Author: Piotr Sokół +Date: Fri Apr 6 10:15:44 2012 +0200 + + l10n: Updated Polish (pl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 97134eb620fbe7adf4d5e83ae4cbbd120a7ed7e0 +Author: Seong-ho Cho +Date: Thu Apr 5 11:50:04 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d584c7f4fc2a230955175241be00a79457581b37 +Author: Seong-ho Cho +Date: Thu Apr 5 10:14:48 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 55d8e5bcd9e38e617a76e3468efe6029da955dac +Author: Ivica Kolić +Date: Tue Apr 3 00:34:42 2012 +0200 + + l10n: Updated Croatian (hr) translation to 81% + + New status: 92 messages complete with 0 fuzzies and 21 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit afd810bd934e0f6b2ea67d9cbfa96697928c5f52 +Author: Pjotr Anon +Date: Mon Apr 2 10:37:36 2012 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e324aee3bbcbedcdab4d73e0053ff26c0d4be212 +Author: Henrique P. Machado +Date: Mon Apr 2 02:42:19 2012 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 113 messages complete with 0 fuzzies and 0 untranslated. - This reverts commit f5e0216b2bd1c8edcd110913178ccd18ed5808fd. + Transmitted-via: Transifex (translations.xfce.org). + +commit 48cd49303175d429b10c4d28b65619e610f07a63 +Author: Nick Schermer +Date: Wed Mar 28 18:43:07 2012 +0200 + + Post release tag bump. + +commit 9442d8ccec13bdd3002d14b80c6f63c360a41abc +Author: Nick Schermer +Date: Wed Mar 28 18:42:25 2012 +0200 + + Updates for release. + +commit 7c47ba785688f1a1a82d10353d10efedf0ed4dac +Author: Nick Schermer +Date: Wed Mar 28 18:39:02 2012 +0200 + + Show in correct settings category. commit c9cc400fd989397e141c09fb7dd58cad88eea374 Author: Kamil Polczak diff -Nru thunar-volman-0.6.1/compile thunar-volman-0.8.1/compile --- thunar-volman-0.6.1/compile 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/compile 2015-02-28 17:59:10.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru thunar-volman-0.6.1/config.guess thunar-volman-0.8.1/config.guess --- thunar-volman-0.6.1/config.guess 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/config.guess 2015-02-28 17:59:10.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2012-01-01' +timestamp='2014-03-23' # 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # 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 +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-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." @@ -140,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -202,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -304,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -803,10 +820,13 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -854,15 +874,22 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` 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/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -874,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -945,54 +967,74 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + X86_64_ABI= + # If there is a compiler, see if it is configured for 32-bit objects. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + X86_64_ABI=x32 + fi + fi + echo x86_64-unknown-linux-gnu${X86_64_ABI} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1196,6 +1238,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1222,19 +1267,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1251,7 +1308,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1320,158 +1377,10 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi +esac cat >&2 < header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Define to 1 if your C compiler doesn't accept -c and -o together. */ @@ -103,6 +102,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Version string for help dialog */ +#undef TVM_VERSION_HELP + /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE diff -Nru thunar-volman-0.6.1/config.sub thunar-volman-0.8.1/config.sub --- thunar-volman-0.6.1/config.sub 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/config.sub 2015-02-28 17:59:10.000000000 +0000 @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. - -timestamp='2012-01-01' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2014 Free Software Foundation, Inc. + +timestamp='2014-07-28' + +# 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-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." @@ -125,13 +116,17 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -154,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -223,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -247,24 +248,28 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx | dvp \ | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -278,20 +283,22 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -319,7 +326,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -332,7 +339,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -355,15 +365,16 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -372,11 +383,13 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -390,18 +403,22 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -775,11 +792,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -793,6 +814,24 @@ basic_machine=m68k-atari os=-mint ;; + mipsEE* | ee | ps2) + basic_machine=mips64r5900el-scei + case $os in + -linux*) + ;; + *) + os=-elf + ;; + esac + ;; + iop) + basic_machine=mipsel-scei + os=-irx + ;; + dvp) + basic_machine=dvp-scei + os=-elf + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -807,6 +846,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -815,7 +858,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1006,7 +1049,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1333,29 +1380,29 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -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* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1479,9 +1526,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1530,6 +1574,12 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff -Nru thunar-volman-0.6.1/configure thunar-volman-0.8.1/configure --- thunar-volman-0.6.1/configure 2012-03-28 16:34:47.000000000 +0000 +++ thunar-volman-0.8.1/configure 2015-02-28 17:59:11.000000000 +0000 @@ -1,19 +1,17 @@ #! /bin/sh -# From configure.in Id. +# From configure.ac d230504. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for thunar-volman 0.6.1. +# Generated by GNU Autoconf 2.69 for thunar-volman 0.8.1. # # Report bugs to . # -# Copyright (c) 2004-2011 The Thunar development team. All rights reserved. +# Copyright (c) 2004-2015 The Thunar development team. All rights reserved. # # Written for thunar-volman by Benedikt Meurer # and Jannis Pohlmann . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -142,6 +140,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -175,7 +198,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -228,21 +252,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -345,6 +373,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -466,6 +502,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -500,16 +540,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -521,28 +561,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -576,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='thunar-volman' PACKAGE_TARNAME='thunar-volman' -PACKAGE_VERSION='0.6.1' -PACKAGE_STRING='thunar-volman 0.6.1' +PACKAGE_VERSION='0.8.1' +PACKAGE_STRING='thunar-volman 0.8.1' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -678,10 +698,12 @@ INTLLIBS INSTOBJEXT GMOFILES +DATADIRNAME CATOBJEXT CATALOGS MSGFMT_OPTS GETTEXT_PACKAGE +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -698,7 +720,6 @@ ac_ct_DUMPBIN DUMPBIN LIBTOOL -DATADIRNAME ALL_LINGUAS INTLTOOL_PERL GMSGFMT @@ -730,7 +751,6 @@ INTLTOOL__v_MERGE_0 INTLTOOL__v_MERGE_ INTLTOOL_V_MERGE -AM_DEFAULT_VERBOSITY INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -761,6 +781,10 @@ MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -837,6 +861,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_maintainer_mode enable_dependency_tracking with_gnu_ld @@ -845,6 +870,7 @@ enable_shared with_pic enable_fast_install +with_aix_soname with_sysroot enable_libtool_lock with_locales_dir @@ -861,6 +887,7 @@ LIBS CPPFLAGS CPP +LT_SYS_LIBRARY_PATH PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR' @@ -1319,8 +1346,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1406,7 +1431,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures thunar-volman 0.6.1 to adapt to many kinds of systems. +\`configure' configures thunar-volman 0.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1477,7 +1502,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of thunar-volman 0.6.1:";; + short | recursive ) echo "Configuration of thunar-volman 0.8.1:";; esac cat <<\_ACEOF @@ -1485,10 +1510,15 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-nls do not use Native Language Support --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] @@ -1509,8 +1539,11 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-locales-dir=DIR Install locales into DIR @@ -1524,6 +1557,8 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1596,14 +1631,14 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -thunar-volman configure 0.6.1 -generated by GNU Autoconf 2.68 +thunar-volman configure 0.8.1 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright (c) 2004-2011 The Thunar development team. All rights reserved. +Copyright (c) 2004-2015 The Thunar development team. All rights reserved. Written for thunar-volman by Benedikt Meurer and Jannis Pohlmann . @@ -1881,7 +1916,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1970,8 +2005,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by thunar-volman $as_me 0.6.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by thunar-volman $as_me 0.8.1, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2319,6 +2354,7 @@ + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2460,7 +2496,7 @@ program_prefix=${target_alias}- -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2499,7 +2535,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2557,9 +2593,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2570,32 +2603,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2607,6 +2648,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2629,12 +2680,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2646,10 +2697,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2668,7 +2719,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2708,7 +2759,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2759,7 +2810,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2788,12 +2839,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2812,7 +2857,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2876,6 +2921,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2898,7 +2982,7 @@ # Define the identity of the package. PACKAGE='thunar-volman' - VERSION='0.6.1' + VERSION='0.8.1' cat >>confdefs.h <<_ACEOF @@ -2926,6 +3010,12 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used @@ -2933,92 +3023,173 @@ AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi ac_config_headers="$ac_config_headers config.h" @@ -3044,6 +3215,45 @@ MAINT=$MAINTAINER_MODE_TRUE +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + DEPDIR="${am__leading_dot}deps" @@ -3064,7 +3274,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3130,7 +3340,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3170,7 +3380,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3223,7 +3433,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3264,7 +3474,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3322,7 +3532,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3366,7 +3576,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3812,8 +4022,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3898,6 +4107,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -3909,8 +4177,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -3945,16 +4213,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3963,8 +4231,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -3972,7 +4240,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4181,7 +4449,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4247,7 +4515,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4454,8 +4722,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -4566,7 +4834,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4606,7 +4874,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4659,7 +4927,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4700,7 +4968,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4758,7 +5026,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4802,7 +5070,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4998,8 +5266,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5084,6 +5351,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -5095,8 +5421,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -5131,16 +5457,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5149,8 +5475,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -5158,7 +5484,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5345,7 +5671,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5424,7 +5750,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5520,7 +5846,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -5546,19 +5872,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -5572,7 +5898,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. @@ -5583,7 +5909,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -5594,32 +5920,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -5680,18 +6006,16 @@ ;; esac -if test -n ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 -$as_echo_n "checking for intltool >= ... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "0.35.0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 +$as_echo_n "checking for intltool >= 0.35.0... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -5712,7 +6036,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5752,7 +6076,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5792,7 +6116,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5848,7 +6172,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -5972,7 +6300,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6012,7 +6340,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6052,7 +6380,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6092,7 +6420,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6143,7 +6471,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6192,74 +6520,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - - - - - -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=no -fi - - - - @@ -6273,8 +6533,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -6288,7 +6548,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within # double-quoted strings. @@ -6314,33 +6574,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -6351,15 +6616,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -6384,7 +6649,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6428,7 +6693,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6465,9 +6730,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -6475,8 +6740,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -6527,7 +6792,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -6567,7 +6832,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` @@ -6617,22 +6882,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -6650,7 +6916,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -6668,30 +6934,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -6814,13 +7056,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -6852,7 +7094,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6892,7 +7134,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6948,13 +7190,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]*) @@ -6981,8 +7223,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 @@ -7018,10 +7259,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -7060,7 +7297,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -7082,8 +7319,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)$' @@ -7136,6 +7373,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -7198,7 +7438,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7238,7 +7478,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7293,8 +7533,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 @@ -7306,7 +7546,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -7341,7 +7581,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7385,7 +7625,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7460,7 +7700,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -7468,7 +7708,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -7481,7 +7721,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -7510,7 +7750,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7550,7 +7790,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7609,7 +7849,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7649,7 +7889,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7698,7 +7938,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -7788,7 +8028,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -7821,14 +8061,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= @@ -7846,21 +8116,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'" @@ -7908,11 +8181,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -7938,7 +8211,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} }; @@ -7958,13 +8231,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -7985,7 +8258,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= @@ -8038,6 +8311,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -8050,9 +8333,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -8062,8 +8345,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -8075,18 +8358,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -8095,24 +8459,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -8141,9 +8506,50 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -8157,9 +8563,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8178,7 +8594,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8196,7 +8615,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -8236,13 +8655,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -8254,7 +8674,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*) @@ -8263,7 +8683,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 ;; *) @@ -8279,7 +8699,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -8298,7 +8718,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8338,7 +8758,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8390,7 +8810,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -8418,7 +8838,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8458,7 +8878,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8510,7 +8930,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8550,7 +8970,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8602,7 +9022,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8642,7 +9062,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8694,7 +9114,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8734,7 +9154,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8786,7 +9206,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8826,7 +9246,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8893,7 +9313,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -8911,7 +9331,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8950,7 +9370,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -8979,7 +9399,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8992,32 +9412,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -9025,6 +9445,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default @@ -9043,6 +9498,35 @@ # Set options +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + enable_static=no +fi + + + + + + + @@ -9061,14 +9545,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9093,14 +9577,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9108,8 +9592,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -9125,14 +9607,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9146,11 +9628,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -9199,7 +9733,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -9238,7 +9772,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 @@ -9249,14 +9783,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 @@ -9265,15 +9799,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -9288,22 +9815,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -9326,13 +9853,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -9354,22 +9881,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -9392,13 +9919,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -9419,7 +9946,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9477,7 +10004,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -9493,7 +10020,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9523,7 +10050,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -9541,17 +10068,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -9562,8 +10090,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -9579,6 +10107,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -9649,7 +10182,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -9657,10 +10190,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -9676,7 +10228,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -9685,9 +10237,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -9712,6 +10264,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -9809,7 +10367,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -9838,7 +10396,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -9870,7 +10428,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9900,7 +10458,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -9932,7 +10490,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9951,13 +10509,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -10077,8 +10635,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -10090,9 +10648,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -10135,9 +10693,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -10152,7 +10710,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 ;; @@ -10160,7 +10718,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -10170,7 +10728,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 @@ -10192,24 +10750,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -10222,7 +10780,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -10241,7 +10799,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10257,7 +10815,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -10267,7 +10825,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -10275,61 +10833,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -10340,42 +10926,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -10389,8 +10980,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -10408,8 +10999,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10421,7 +11012,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -10436,9 +11027,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10455,15 +11046,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -10479,7 +11070,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -10487,34 +11078,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -10533,13 +11147,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -10558,35 +11180,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10621,7 +11250,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -10629,17 +11258,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10674,7 +11303,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -10682,21 +11311,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -10705,7 +11346,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10735,16 +11376,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -10753,18 +11395,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -10773,7 +11415,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -10792,24 +11434,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -10851,33 +11493,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -10885,25 +11527,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -10915,7 +11557,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -10934,14 +11576,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -10949,8 +11591,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -10961,7 +11603,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -10972,8 +11614,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -10983,8 +11625,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -10996,24 +11638,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -11028,7 +11680,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -11036,27 +11688,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -11067,33 +11711,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -11104,24 +11768,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -11131,11 +11795,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -11145,10 +11809,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -11197,43 +11861,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -11248,10 +11912,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -11259,7 +11923,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -11285,7 +11949,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -11500,14 +12164,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -11523,28 +12187,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--; } @@ -11558,7 +12229,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 @@ -11567,7 +12238,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11584,14 +12255,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -11599,41 +12272,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 ;; @@ -11643,18 +12366,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 ;; @@ -11662,8 +12385,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" @@ -11675,7 +12398,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -11684,8 +12407,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~ @@ -11701,17 +12424,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -11720,8 +12443,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*) @@ -11748,7 +12471,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'` @@ -11761,8 +12484,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' @@ -11775,7 +12498,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 @@ -11788,8 +12511,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`' @@ -11802,8 +12525,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 ;; @@ -11818,17 +12541,31 @@ *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + 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 ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -11851,26 +12588,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11888,14 +12614,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' @@ -11903,8 +12630,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 ;; @@ -11913,8 +12640,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, ... @@ -11927,8 +12654,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 @@ -11939,7 +12666,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 @@ -11947,8 +12674,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= @@ -11967,8 +12694,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 ;; @@ -11977,13 +12704,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -12027,7 +12774,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" @@ -12047,12 +12799,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 @@ -12062,7 +12814,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 ;; @@ -12071,58 +12823,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*) @@ -12133,8 +12895,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 @@ -12144,11 +12906,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 @@ -12156,8 +12918,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) @@ -12178,24 +12940,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' @@ -12213,7 +12975,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 @@ -12221,8 +12983,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 ;; @@ -12232,20 +12994,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -12342,15 +13119,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -12365,12 +13142,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -12380,7 +13157,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -12390,23 +13167,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -12444,10 +13221,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -12455,10 +13232,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -12497,11 +13282,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -12540,7 +13325,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -12579,7 +13364,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -12618,7 +13403,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -12639,21 +13424,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -12661,7 +13446,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12708,9 +13493,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 @@ -12740,7 +13525,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12760,14 +13545,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12814,9 +13599,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 @@ -12846,7 +13631,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12867,9 +13652,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -12913,7 +13698,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -12941,7 +13726,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -12949,13 +13734,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -12963,8 +13748,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 @@ -12974,7 +13763,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12988,7 +13777,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -13049,7 +13838,7 @@ - ALL_LINGUAS="ar ast be bg ca cs da de el en_GB es eu fi fr gl hr hu id is it ja kk ko lt lv nb nl nn pl pt_BR pt ro ru sk sq sv te tr ug uk ur_PK ur zh_CN zh_TW " + ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pl pt_BR pt ro ru sk sl sq sr sv te th tr ug uk ur_PK ur vi zh_CN zh_HK zh_TW " for ac_header in locale.h do : @@ -13548,7 +14337,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13830,7 +14619,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13873,7 +14662,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13937,9 +14726,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.6.0" >&5 -$as_echo_n "checking for exo-1 >= 0.6.0... " >&6; } - if $PKG_CONFIG "--atleast-version=0.6.0" "exo-1" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.10.0" >&5 +$as_echo_n "checking for exo-1 >= 0.10.0... " >&6; } + if $PKG_CONFIG "--atleast-version=0.10.0" "exo-1" >/dev/null 2>&1; then EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_VERSION" >&5 $as_echo "$EXO_VERSION" >&6; } @@ -13956,7 +14745,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_LIBS" >&5 $as_echo "$EXO_LIBS" >&6; } - EXO_REQUIRED_VERSION=0.6.0 + EXO_REQUIRED_VERSION=0.10.0 @@ -13972,7 +14761,7 @@ echo "*** The required package exo-1 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade exo-1 to atleast version 0.6.0, or adjust" + echo "*** Please upgrade exo-1 to atleast version 0.10.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -13984,7 +14773,7 @@ echo "*** The required package exo-1 was not found on your system." - echo "*** Please install exo-1 (atleast version 0.6.0) or adjust" + echo "*** Please install exo-1 (atleast version 0.10.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -14025,7 +14814,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14068,7 +14857,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14132,9 +14921,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.18.0" >&5 -$as_echo_n "checking for glib-2.0 >= 2.18.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.18.0" "glib-2.0" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.30.0" >&5 +$as_echo_n "checking for glib-2.0 >= 2.30.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.30.0" "glib-2.0" >/dev/null 2>&1; then GLIB_VERSION=`$PKG_CONFIG --modversion "glib-2.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_VERSION" >&5 $as_echo "$GLIB_VERSION" >&6; } @@ -14151,7 +14940,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_LIBS" >&5 $as_echo "$GLIB_LIBS" >&6; } - GLIB_REQUIRED_VERSION=2.18.0 + GLIB_REQUIRED_VERSION=2.30.0 @@ -14167,7 +14956,7 @@ echo "*** The required package glib-2.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade glib-2.0 to atleast version 2.18.0, or adjust" + echo "*** Please upgrade glib-2.0 to atleast version 2.30.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -14179,7 +14968,7 @@ echo "*** The required package glib-2.0 was not found on your system." - echo "*** Please install glib-2.0 (atleast version 2.18.0) or adjust" + echo "*** Please install glib-2.0 (atleast version 2.30.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -14220,7 +15009,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14263,7 +15052,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14327,9 +15116,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.18.0" >&5 -$as_echo_n "checking for gio-2.0 >= 2.18.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.18.0" "gio-2.0" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.30.0" >&5 +$as_echo_n "checking for gio-2.0 >= 2.30.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.30.0" "gio-2.0" >/dev/null 2>&1; then GIO_VERSION=`$PKG_CONFIG --modversion "gio-2.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_VERSION" >&5 $as_echo "$GIO_VERSION" >&6; } @@ -14346,7 +15135,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_LIBS" >&5 $as_echo "$GIO_LIBS" >&6; } - GIO_REQUIRED_VERSION=2.18.0 + GIO_REQUIRED_VERSION=2.30.0 @@ -14362,7 +15151,7 @@ echo "*** The required package gio-2.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gio-2.0 to atleast version 2.18.0, or adjust" + echo "*** Please upgrade gio-2.0 to atleast version 2.30.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -14374,7 +15163,7 @@ echo "*** The required package gio-2.0 was not found on your system." - echo "*** Please install gio-2.0 (atleast version 2.18.0) or adjust" + echo "*** Please install gio-2.0 (atleast version 2.30.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -14415,7 +15204,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14458,7 +15247,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14522,9 +15311,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread-2.0 >= 2.18.0" >&5 -$as_echo_n "checking for gthread-2.0 >= 2.18.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.18.0" "gthread-2.0" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread-2.0 >= 2.30.0" >&5 +$as_echo_n "checking for gthread-2.0 >= 2.30.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.30.0" "gthread-2.0" >/dev/null 2>&1; then GTHREAD_VERSION=`$PKG_CONFIG --modversion "gthread-2.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTHREAD_VERSION" >&5 $as_echo "$GTHREAD_VERSION" >&6; } @@ -14541,7 +15330,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTHREAD_LIBS" >&5 $as_echo "$GTHREAD_LIBS" >&6; } - GTHREAD_REQUIRED_VERSION=2.18.0 + GTHREAD_REQUIRED_VERSION=2.30.0 @@ -14557,7 +15346,7 @@ echo "*** The required package gthread-2.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gthread-2.0 to atleast version 2.18.0, or adjust" + echo "*** Please upgrade gthread-2.0 to atleast version 2.30.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -14569,7 +15358,7 @@ echo "*** The required package gthread-2.0 was not found on your system." - echo "*** Please install gthread-2.0 (atleast version 2.18.0) or adjust" + echo "*** Please install gthread-2.0 (atleast version 2.30.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -14610,7 +15399,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14653,7 +15442,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14717,9 +15506,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.14.0" >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.14.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.14.0" "gtk+-2.0" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.24.0" >&5 +$as_echo_n "checking for gtk+-2.0 >= 2.24.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.24.0" "gtk+-2.0" >/dev/null 2>&1; then GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-2.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5 $as_echo "$GTK_VERSION" >&6; } @@ -14736,7 +15525,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 $as_echo "$GTK_LIBS" >&6; } - GTK_REQUIRED_VERSION=2.14.0 + GTK_REQUIRED_VERSION=2.24.0 @@ -14752,7 +15541,7 @@ echo "*** The required package gtk+-2.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gtk+-2.0 to atleast version 2.14.0, or adjust" + echo "*** Please upgrade gtk+-2.0 to atleast version 2.24.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -14764,7 +15553,7 @@ echo "*** The required package gtk+-2.0 was not found on your system." - echo "*** Please install gtk+-2.0 (atleast version 2.14.0) or adjust" + echo "*** Please install gtk+-2.0 (atleast version 2.24.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -14805,7 +15594,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14848,7 +15637,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15000,7 +15789,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15043,7 +15832,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15107,9 +15896,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-1 >= 4.8.0" >&5 -$as_echo_n "checking for libxfce4ui-1 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4ui-1" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-1 >= 4.10.0" >&5 +$as_echo_n "checking for libxfce4ui-1 >= 4.10.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4ui-1" >/dev/null 2>&1; then LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-1"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 $as_echo "$LIBXFCE4UI_VERSION" >&6; } @@ -15126,7 +15915,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 $as_echo "$LIBXFCE4UI_LIBS" >&6; } - LIBXFCE4UI_REQUIRED_VERSION=4.8.0 + LIBXFCE4UI_REQUIRED_VERSION=4.10.0 @@ -15142,7 +15931,7 @@ echo "*** The required package libxfce4ui-1 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfce4ui-1 to atleast version 4.8.0, or adjust" + echo "*** Please upgrade libxfce4ui-1 to atleast version 4.10.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15154,7 +15943,7 @@ echo "*** The required package libxfce4ui-1 was not found on your system." - echo "*** Please install libxfce4ui-1 (atleast version 4.8.0) or adjust" + echo "*** Please install libxfce4ui-1 (atleast version 4.10.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15195,7 +15984,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15238,7 +16027,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15302,9 +16091,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.8.0" >&5 -$as_echo_n "checking for libxfce4util-1.0 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4util-1.0" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.10.0" >&5 +$as_echo_n "checking for libxfce4util-1.0 >= 4.10.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.10.0" "libxfce4util-1.0" >/dev/null 2>&1; then LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 $as_echo "$LIBXFCE4UTIL_VERSION" >&6; } @@ -15321,7 +16110,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 $as_echo "$LIBXFCE4UTIL_LIBS" >&6; } - LIBXFCE4UTIL_REQUIRED_VERSION=4.8.0 + LIBXFCE4UTIL_REQUIRED_VERSION=4.10.0 @@ -15337,7 +16126,7 @@ echo "*** The required package libxfce4util-1.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.8.0, or adjust" + echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.10.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15349,7 +16138,7 @@ echo "*** The required package libxfce4util-1.0 was not found on your system." - echo "*** Please install libxfce4util-1.0 (atleast version 4.8.0) or adjust" + echo "*** Please install libxfce4util-1.0 (atleast version 4.10.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15390,7 +16179,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15433,7 +16222,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15497,9 +16286,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.8.0" >&5 -$as_echo_n "checking for libxfconf-0 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfconf-0" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.10.0" >&5 +$as_echo_n "checking for libxfconf-0 >= 4.10.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.10.0" "libxfconf-0" >/dev/null 2>&1; then XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 $as_echo "$XFCONF_VERSION" >&6; } @@ -15516,7 +16305,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 $as_echo "$XFCONF_LIBS" >&6; } - XFCONF_REQUIRED_VERSION=4.8.0 + XFCONF_REQUIRED_VERSION=4.10.0 @@ -15532,7 +16321,7 @@ echo "*** The required package libxfconf-0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfconf-0 to atleast version 4.8.0, or adjust" + echo "*** Please upgrade libxfconf-0 to atleast version 4.10.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15544,7 +16333,7 @@ echo "*** The required package libxfconf-0 was not found on your system." - echo "*** Please install libxfconf-0 (atleast version 4.8.0) or adjust" + echo "*** Please install libxfconf-0 (atleast version 4.10.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15599,7 +16388,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15642,7 +16431,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15790,6 +16579,15 @@ + + + + + +$as_echo "#define TVM_VERSION_HELP \"0.8\"" >>confdefs.h + + + # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : enableval=$enable_debug; enable_debug=$enableval @@ -15812,10 +16610,10 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs" - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + -Wnested-externs" + CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" @@ -15875,7 +16673,7 @@ CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else @@ -16053,6 +16851,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -16383,16 +17189,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16452,28 +17258,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -16494,8 +17288,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by thunar-volman $as_me 0.6.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by thunar-volman $as_me 0.8.1, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16560,11 +17354,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -thunar-volman config.status 0.6.1 -configured by $0, generated by GNU Autoconf 2.68, +thunar-volman config.status 0.8.1 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16655,7 +17449,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -16697,12 +17491,13 @@ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' @@ -16744,10 +17539,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -16812,7 +17610,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -16863,9 +17662,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -16900,7 +17702,7 @@ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -16927,10 +17729,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -16939,19 +17742,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -17575,7 +18375,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -17588,7 +18388,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -17622,21 +18422,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -17671,55 +18469,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -17744,13 +18540,13 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO -# Whether or not to build static libraries. -build_old_libs=$enable_static - # Which release of libtool.m4 was used? macro_version=$macro_version macro_revision=$macro_revision +# Whether or not to build static libraries. +build_old_libs=$enable_static + # Whether or not to build shared libraries. build_libtool_libs=$enable_shared @@ -17760,6 +18556,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # The PATH separator for the build system. PATH_SEPARATOR=$lt_PATH_SEPARATOR @@ -17856,18 +18655,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -17958,8 +18766,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -18052,13 +18863,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -18110,13 +18921,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -18125,7 +18995,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -18135,165 +19005,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff -Nru thunar-volman-0.6.1/configure.ac thunar-volman-0.8.1/configure.ac --- thunar-volman-0.6.1/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/configure.ac 2015-02-28 17:59:06.000000000 +0000 @@ -0,0 +1,171 @@ +dnl +dnl This file was autogenerated from "configure.ac.in". +dnl Edit that file instead! +dnl + +dnl Copyright (c) 2004-2007 Benedikt Meurer +dnl Copyright (c) 2010-2011 Jannis Pohlmann +dnl +dnl This program is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU General Public License as +dnl published by the Free Software Foundation; either version 2 of +dnl the License, or (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public +dnl License along with this program; if not, write to the Free +dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +dnl Boston, MA 02110-1301, USA. + +dnl *************************** +dnl *** Version information *** +dnl *************************** +m4_define([tvm_version_major], [0]) +m4_define([tvm_version_minor], [8]) +m4_define([tvm_version_micro], [1]) +m4_define([tvm_version_build], [d230504]) +m4_define([tvm_version_tag], []) +m4_define([tvm_version], [tvm_version_major().tvm_version_minor().tvm_version_micro()ifelse(tvm_version_tag(), [git], [tvm_version_tag()-tvm_version_build()], [tvm_version_tag()])]) + +dnl ******************************************* +dnl *** Debugging support for GIT snapshots *** +dnl ******************************************* +m4_define([tvm_debug_default], [ifelse(tvm_version_tag(), [git], [full], [minimum])]) + +dnl *************************** +dnl *** Initialize autoconf *** +dnl *************************** +AC_COPYRIGHT([Copyright (c) 2004-2015 The Thunar development team. All rights reserved. + +Written for thunar-volman by Benedikt Meurer +and Jannis Pohlmann .]) +AC_INIT([thunar-volman], [tvm_version], [http://bugzilla.xfce.org/]) +AC_PREREQ([2.60]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CANONICAL_TARGET() +AC_REVISION([tvm_version_build]) + +dnl *************************** +dnl *** Initialize automake *** +dnl *************************** +AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar no-dist-gzip]) +AC_CONFIG_HEADERS([config.h]) +AM_MAINTAINER_MODE() +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl ******************************* +dnl *** Check for UNIX variants *** +dnl ******************************* +AC_AIX() +AC_ISC_POSIX() +AC_MINIX() + +dnl ******************************** +dnl *** Check for basic programs *** +dnl ******************************** +AC_PROG_CC() +AC_PROG_CC_C_O() +AC_PROG_LD() +AC_PROG_INSTALL() +IT_PROG_INTLTOOL([0.35.0]) + +dnl ************************** +dnl *** Initialize libtool *** +dnl ************************** +LT_PREREQ([2.4]) +LT_INIT([disable-static]) + +dnl ********************************** +dnl *** Check for standard headers *** +dnl ********************************** +AC_CHECK_HEADERS([errno.h path.h stdarg.h sys/types.h sys/wait.h]) + +dnl ************************************ +dnl *** Check for standard functions *** +dnl ************************************ +AC_CHECK_FUNCS([]) + +dnl ****************************** +dnl *** Check for i18n support *** +dnl ****************************** +XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pl pt_BR pt ro ru sk sl sq sr sv te th tr ug uk ur_PK ur vi zh_CN zh_HK zh_TW ]) + +dnl *********************************** +dnl *** Check for required packages *** +dnl *********************************** +XDT_CHECK_PACKAGE([EXO], [exo-1], [0.10.0]) +XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) +XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0]) +XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) +XDT_CHECK_PACKAGE([GUDEV], [gudev-1.0], [145]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) + +dnl ******************************************************* +dnl *** Optional mount notification support (libnotify) *** +dnl ******************************************************* +XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications], + [Notifications support], [yes]) + +dnl *************************************************** +dnl *** define a version string for the help dialog *** +dnl *************************************************** +m4_append([tvm_version_help], ["]) +m4_append([tvm_version_help], [tvm_version_major]) +m4_append([tvm_version_help], [.]) +m4_append([tvm_version_help], [tvm_version_minor]) +m4_append([tvm_version_help], ["]) +AC_DEFINE([TVM_VERSION_HELP], [tvm_version_help], [Version string for help dialog]) + +dnl *********************************** +dnl *** Check for debugging support *** +dnl *********************************** +XDT_FEATURE_DEBUG() + +dnl ************************************** +dnl *** Check for linker optimizations *** +dnl ************************************** +XDT_FEATURE_LINKER_OPTS() + +dnl ********************************* +dnl *** Substitute platform flags *** +dnl ********************************* +AC_MSG_CHECKING([PLATFORM_CPPFLAGS]) +AC_MSG_RESULT([$PLATFORM_CPPFLAGS]) +AC_SUBST([PLATFORM_CPPFLAGS]) +AC_MSG_CHECKING([PLATFORM_CFLAGS]) +AC_MSG_RESULT([$PLATFORM_CFLAGS]) +AC_SUBST([PLATFORM_CFLAGS]) +AC_MSG_CHECKING([PLATFORM_LDFLAGS]) +AC_MSG_RESULT([$PLATFORM_LDFLAGS]) +AC_SUBST([PLATFORM_LDFLAGS]) + +AC_OUTPUT([ +Makefile +icons/Makefile +icons/48x48/Makefile +icons/scalable/Makefile +po/Makefile.in +thunar-volman/Makefile +thunar-volman-settings/Makefile +]) + +dnl *************************** +dnl *** Print configuration *** +dnl *************************** +echo +echo "Build Configuration:" +echo +if test x"$LIBNOTIFY_FOUND" = x"yes"; then +echo "* Mount notifications: yes" +else +echo "* Mount notifications: no" +fi +echo "* Debug Support: $enable_debug" +echo diff -Nru thunar-volman-0.6.1/configure.in thunar-volman-0.8.1/configure.in --- thunar-volman-0.6.1/configure.in 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,161 +0,0 @@ -dnl -dnl This file was autogenerated from "configure.in.in". -dnl Edit that file instead! -dnl - -dnl $Id$ -dnl -dnl Copyright (c) 2004-2007 Benedikt Meurer -dnl Copyright (c) 2010 Jannis Pohlmann -dnl -dnl This program is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU General Public License as -dnl published by the Free Software Foundation; either version 2 of -dnl the License, or (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public -dnl License along with this program; if not, write to the Free -dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -dnl Boston, MA 02110-1301, USA. - -dnl *************************** -dnl *** Version information *** -dnl *************************** -m4_define([tvm_version_major], [0]) -m4_define([tvm_version_minor], [6]) -m4_define([tvm_version_micro], [1]) -m4_define([tvm_version_build], [97f1084]) -m4_define([tvm_version_tag], []) -m4_define([tvm_version], [tvm_version_major().tvm_version_minor().tvm_version_micro()ifelse(tvm_version_tag(), [git], [tvm_version_tag()-tvm_version_build()], [tvm_version_tag()])]) - -dnl ******************************************* -dnl *** Debugging support for GIT snapshots *** -dnl ******************************************* -m4_define([tvm_debug_default], [ifelse(tvm_version_tag(), [git], [full], [minimum])]) - -dnl *************************** -dnl *** Initialize autoconf *** -dnl *************************** -AC_COPYRIGHT([Copyright (c) 2004-2011 The Thunar development team. All rights reserved. - -Written for thunar-volman by Benedikt Meurer -and Jannis Pohlmann .]) -AC_INIT([thunar-volman], [tvm_version], [http://bugzilla.xfce.org/]) -AC_PREREQ([2.50]) -AC_CANONICAL_TARGET() -AC_REVISION([$Id$]) - -dnl *************************** -dnl *** Initialize automake *** -dnl *************************** -AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) -AM_CONFIG_HEADER([config.h]) -AM_MAINTAINER_MODE() - -dnl ******************************* -dnl *** Check for UNIX variants *** -dnl ******************************* -AC_AIX() -AC_ISC_POSIX() -AC_MINIX() - -dnl ******************************** -dnl *** Check for basic programs *** -dnl ******************************** -AC_PROG_CC() -AC_PROG_CC_C_O() -AC_PROG_LD() -AC_PROG_INSTALL() -AC_PROG_INTLTOOL() - -dnl ************************** -dnl *** Initialize libtool *** -dnl ************************** -AC_DISABLE_STATIC() -AC_PROG_LIBTOOL() - -dnl ********************************** -dnl *** Check for standard headers *** -dnl ********************************** -AC_CHECK_HEADERS([errno.h path.h stdarg.h sys/types.h sys/wait.h]) - -dnl ************************************ -dnl *** Check for standard functions *** -dnl ************************************ -AC_CHECK_FUNCS([]) - -dnl ****************************** -dnl *** Check for i18n support *** -dnl ****************************** -XDT_I18N([ar ast be bg ca cs da de el en_GB es eu fi fr gl hr hu id is it ja kk ko lt lv nb nl nn pl pt_BR pt ro ru sk sq sv te tr ug uk ur_PK ur zh_CN zh_TW ]) - -dnl *********************************** -dnl *** Check for required packages *** -dnl *********************************** -XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0]) -XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0]) -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) -XDT_CHECK_PACKAGE([GUDEV], [gudev-1.0], [145]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) -XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0]) - -dnl ******************************************************* -dnl *** Optional mount notification support (libnotify) *** -dnl ******************************************************* -XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications], - [Notifications support], [yes]) - -dnl *********************************** -dnl *** Check for debugging support *** -dnl *********************************** -XDT_FEATURE_DEBUG() - -dnl ************************************** -dnl *** Check for linker optimizations *** -dnl ************************************** -XDT_FEATURE_LINKER_OPTS() - -dnl ********************************* -dnl *** Substitute platform flags *** -dnl ********************************* -AC_MSG_CHECKING([PLATFORM_CPPFLAGS]) -AC_MSG_RESULT([$PLATFORM_CPPFLAGS]) -AC_SUBST([PLATFORM_CPPFLAGS]) -AC_MSG_CHECKING([PLATFORM_CFLAGS]) -AC_MSG_RESULT([$PLATFORM_CFLAGS]) -AC_SUBST([PLATFORM_CFLAGS]) -AC_MSG_CHECKING([PLATFORM_LDFLAGS]) -AC_MSG_RESULT([$PLATFORM_LDFLAGS]) -AC_SUBST([PLATFORM_LDFLAGS]) - -AC_OUTPUT([ -Makefile -icons/Makefile -icons/48x48/Makefile -icons/scalable/Makefile -po/Makefile.in -thunar-volman/Makefile -thunar-volman-settings/Makefile -]) - -dnl *************************** -dnl *** Print configuration *** -dnl *************************** -echo -echo "Build Configuration:" -echo -if test x"$LIBNOTIFY_FOUND" = x"yes"; then -echo "* Mount notifications: yes" -else -echo "* Mount notifications: no" -fi -echo "* Debug Support: $enable_debug" -echo diff -Nru thunar-volman-0.6.1/debian/changelog thunar-volman-0.8.1/debian/changelog --- thunar-volman-0.6.1/debian/changelog 2012-03-30 20:02:01.000000000 +0000 +++ thunar-volman-0.8.1/debian/changelog 2015-06-17 16:02:35.000000000 +0000 @@ -1,16 +1,94 @@ -thunar-volman (0.6.1-0ubuntu1) precise; urgency=low +thunar-volman (0.8.1-2~ubuntu12.04.1) precise; urgency=low - * New upstream bugfix release: - - Do not make icon names translatable. - - Translation updates. + * No-change backport to precise - -- Lionel Le Folgoc Fri, 30 Mar 2012 22:01:09 +0200 + -- Pavel Sofishchenko Wed, 17 Jun 2015 21:02:35 +0500 -thunar-volman (0.6.0-4build1) oneiric; urgency=low +thunar-volman (0.8.1-2) unstable; urgency=medium - * No-change rebuild for libnotify transition. + * Upload to unstable. - -- Lionel Le Folgoc Sun, 12 Jun 2011 17:48:55 +0200 + -- Yves-Alexis Perez Wed, 06 May 2015 16:33:20 +0200 + +thunar-volman (0.8.1-1) experimental; urgency=medium + + [ Yves-Alexis Perez ] + * debian/control: + - Fix Vcs-* urls. + + [ Jackson Doak ] + * New upstream release + + -- Yves-Alexis Perez Sun, 08 Mar 2015 21:04:58 +0100 + +thunar-volman (0.8.0-4) unstable; urgency=medium + + * debian/control: + - drop build-dep on chrpath. + * debian/rules: + - drop call to chrpath, not needed anymore. + + -- Yves-Alexis Perez Sun, 02 Feb 2014 21:55:09 +0100 + +thunar-volman (0.8.0-3) unstable; urgency=low + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org + + [ Jackson Doak ] + * debian/control: + - Bump standards-version to 3.9.4 + - Remove redundant "section" category + * debian/rules: + - Add option for verbose mode + * Create manpage for thunar-volman-settings + + [ Yves-Alexis Perez ] + * debian/rules: + - use autotools-dev addon to update autotools helper files. + * debian/control: + - add build-dep on autotools-dev. + - update standards version to 3.9.5. + + -- Yves-Alexis Perez Sun, 02 Feb 2014 21:36:42 +0100 + +thunar-volman (0.8.0-2) unstable; urgency=low + + * Upload to unstable. + * debian/rules: + - enable all hardening flags. + + -- Yves-Alexis Perez Wed, 22 May 2013 00:38:28 +0200 + +thunar-volman (0.8.0-1) experimental; urgency=low + + [ Lionel Le Folgoc ] + * New upstream release. + * debian/control: + - bump b-deps for Xfce 4.10. + * debian/rules: + - drop obsolete --disable-rpath configure flag + - pass --parallel to dh. + + [ Yves-Alexis Perez ] + * debian/watch updated to track development releases. + + -- Lionel Le Folgoc Sat, 05 May 2012 14:19:58 +0200 + +thunar-volman (0.6.1-1) unstable; urgency=low + + * New upstream release. + * debian/watch updated since thunar-volman is now part of core Xfce. + * debian/control: + - update standards version to 3.9.3. + - update debhelper build-dep to 9 and add build-dep on dpkg-dev 1.16.1 for + hardening support. + - drop build-dep on hardening-includes. + * debian/compat bumped to 9. + * debian/rules: + - use debhelper 9 / dpkg-dev hardening support. + + -- Yves-Alexis Perez Fri, 30 Mar 2012 07:34:59 +0200 thunar-volman (0.6.0-4) unstable; urgency=low diff -Nru thunar-volman-0.6.1/debian/compat thunar-volman-0.8.1/debian/compat --- thunar-volman-0.6.1/debian/compat 2009-04-04 14:23:43.000000000 +0000 +++ thunar-volman-0.8.1/debian/compat 2012-03-30 19:47:24.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru thunar-volman-0.6.1/debian/control thunar-volman-0.8.1/debian/control --- thunar-volman-0.6.1/debian/control 2012-03-30 20:02:21.000000000 +0000 +++ thunar-volman-0.8.1/debian/control 2015-02-28 19:10:16.000000000 +0000 @@ -1,21 +1,19 @@ Source: thunar-volman Section: xfce Priority: optional -Maintainer: Xubuntu Developers -XSBC-Original-Maintainer: Debian Xfce Maintainers +Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc -Build-Depends: debhelper (>= 7.0.50~), libexo-1-dev (>= 0.6.0), +Build-Depends: debhelper (>= 9), libexo-1-dev (>= 0.6.0), dpkg-dev (>= 1.16.1), libgudev-1.0-dev (>= 145), libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), libnotify-dev, - chrpath, libxml-parser-perl, intltool, hardening-includes -Standards-Version: 3.9.2 -Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-volman/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-volman/ + libxml-parser-perl, intltool, autotools-dev +Standards-Version: 3.9.6 +Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/thunar-volman/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/thunar-volman/ Homepage: http://goodies.xfce.org/projects/thunar-plugins/thunar-volman Package: thunar-volman -Section: xfce Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, thunar (>= 1.1.1), exo-utils Description: Thunar extension for volumes management diff -Nru thunar-volman-0.6.1/debian/manpages thunar-volman-0.8.1/debian/manpages --- thunar-volman-0.6.1/debian/manpages 2011-04-02 14:44:32.000000000 +0000 +++ thunar-volman-0.8.1/debian/manpages 2013-08-24 08:08:49.000000000 +0000 @@ -1 +1,2 @@ debian/thunar-volman.1 +debian/thunar-volman-settings.1 \ No newline at end of file diff -Nru thunar-volman-0.6.1/debian/rules thunar-volman-0.8.1/debian/rules --- thunar-volman-0.6.1/debian/rules 2011-04-02 14:44:32.000000000 +0000 +++ thunar-volman-0.8.1/debian/rules 2014-02-02 20:52:11.000000000 +0000 @@ -1,21 +1,14 @@ #!/usr/bin/make -f -include /usr/share/hardening-includes/hardening.make +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -CFLAGS=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1 -CFLAGS+=$(HARDENING_CFLAGS) - -export CFLAGS LDFLAGS +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs +export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh $@ - -override_dh_auto_configure: - dh_auto_configure -- --disable-rpath + dh $@ --parallel --with autotools-dev override_dh_install: - chrpath -d -k $(CURDIR)/debian/thunar-volman/usr/bin/thunar-volman dh_install --fail-missing dh_install debian/thunar-volman.xml /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/ diff -Nru thunar-volman-0.6.1/debian/thunar-volman-settings.1 thunar-volman-0.8.1/debian/thunar-volman-settings.1 --- thunar-volman-0.6.1/debian/thunar-volman-settings.1 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/debian/thunar-volman-settings.1 2013-08-24 08:08:49.000000000 +0000 @@ -0,0 +1,60 @@ +.TH THUNAR-VOLMAN-SETTINGS "1" "August 2013" "thunar-volman-settings" "User Commands" +.SH NAME +thunar-volman-settings \- controls configuration of thunar's removable media +.SH NOTE +Note that usually this command is invoked by thunar itself and you should +only use this if you are having problems adding the device as per the +documentation cited at the end of this manpage. +.SH DESCRIPTION +.SS "Usage:" +.IP +thunar\-volman\-settings [OPTION...] +.SS "Help Options:" +.TP +\fB\-h\fR, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.PP +GTK+ Options +.TP +\fB\-\-class\fR=\fICLASS\fR +Program class as used by the window manager +.TP +\fB\-\-name\fR=\fINAME\fR +Program name as used by the window manager +.TP +\fB\-\-screen\fR=\fISCREEN\fR +X screen to use +.TP +\fB\-\-sync\fR +Make X calls synchronous +.TP +\fB\-\-gtk\-module\fR=\fIMODULES\fR +Load additional GTK+ modules +.TP +\fB\-\-g\-fatal\-warnings\fR +Make all warnings fatal +.SS "Application Options:" +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH AUTHOR +Written by Benedikt Meurer . +.PP +This manual page was written by Jackson Doak (with +help from help2man) for the Debian project but may be used by others. +.PP +Please report bugs to Debian's bug tracking system. Details can be found at +http://bugs.debian.org/ +.SH COPYRIGHT +Copyright \(co 2004-2013 + The Thunar development team. All rights reserved. +.SH "SEE ALSO" +The full documentation for +.B thunar-volman-settings +is maintained in /usr/share/doc/thunar/html/C/using-removable-media.html \ No newline at end of file diff -Nru thunar-volman-0.6.1/debian/watch thunar-volman-0.8.1/debian/watch --- thunar-volman-0.6.1/debian/watch 2010-03-11 17:57:22.000000000 +0000 +++ thunar-volman-0.8.1/debian/watch 2013-05-21 22:36:36.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -http://archive.xfce.org/src/apps/thunar-volman/([\d\.]+)/ \ +http://archive.xfce.org/src/xfce/thunar-volman/([\d\.]+)/ \ thunar-volman-([\d\.]+)\.tar\.(?:gz|bz2) diff -Nru thunar-volman-0.6.1/depcomp thunar-volman-0.8.1/depcomp --- thunar-volman-0.6.1/depcomp 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/depcomp 2015-02-28 17:59:10.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,8 +39,8 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +56,66 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,26 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -122,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -131,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -145,33 +216,31 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -189,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -198,43 +266,41 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -247,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -258,44 +322,100 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -307,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -319,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -332,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -343,77 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -424,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -443,14 +544,15 @@ p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -478,7 +580,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,18 +600,18 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -562,11 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -583,7 +686,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -602,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -637,23 +740,23 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru thunar-volman-0.6.1/icons/48x48/Makefile.am thunar-volman-0.8.1/icons/48x48/Makefile.am --- thunar-volman-0.6.1/icons/48x48/Makefile.am 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/icons/48x48/Makefile.am 2015-02-26 13:43:36.000000000 +0000 @@ -1,5 +1,3 @@ -# $Id$ - iconsdir = $(datadir)/icons/hicolor/48x48/apps icons_DATA = \ tvm-burn-cd.png \ diff -Nru thunar-volman-0.6.1/icons/48x48/Makefile.in thunar-volman-0.8.1/icons/48x48/Makefile.in --- thunar-volman-0.6.1/icons/48x48/Makefile.in 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/icons/48x48/Makefile.in 2015-02-28 17:59:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -15,9 +14,52 @@ @SET_MAKE@ -# $Id$ - VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,17 +80,34 @@ host_triplet = @host@ target_triplet = @target@ subdir = icons/48x48 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +137,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -171,6 +231,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -323,8 +384,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -339,11 +403,11 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -482,16 +546,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff -Nru thunar-volman-0.6.1/icons/Makefile.am thunar-volman-0.8.1/icons/Makefile.am --- thunar-volman-0.6.1/icons/Makefile.am 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/icons/Makefile.am 2015-02-26 13:43:26.000000000 +0000 @@ -1,5 +1,3 @@ -# $Id$ - SUBDIRS = \ 48x48 \ scalable diff -Nru thunar-volman-0.6.1/icons/Makefile.in thunar-volman-0.8.1/icons/Makefile.in --- thunar-volman-0.6.1/icons/Makefile.in 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/icons/Makefile.in 2015-02-28 17:59:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -14,9 +13,52 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $Id$ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,29 +79,67 @@ host_triplet = @host@ target_triplet = @target@ subdir = icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -181,6 +261,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -330,22 +411,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -360,57 +444,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -426,12 +465,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -443,15 +477,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -460,6 +490,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -496,13 +541,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -624,22 +666,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-data-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-data-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-hook install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am install-data-hook: diff -Nru thunar-volman-0.6.1/icons/scalable/Makefile.am thunar-volman-0.8.1/icons/scalable/Makefile.am --- thunar-volman-0.6.1/icons/scalable/Makefile.am 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/icons/scalable/Makefile.am 2015-02-26 13:43:43.000000000 +0000 @@ -1,5 +1,3 @@ -# $Id$ - iconsdir = $(datadir)/icons/hicolor/scalable/apps icons_DATA = \ tvm-burn-cd.svg diff -Nru thunar-volman-0.6.1/icons/scalable/Makefile.in thunar-volman-0.8.1/icons/scalable/Makefile.in --- thunar-volman-0.6.1/icons/scalable/Makefile.in 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/icons/scalable/Makefile.in 2015-02-28 17:59:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -15,9 +14,52 @@ @SET_MAKE@ -# $Id$ - VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,17 +80,34 @@ host_triplet = @host@ target_triplet = @target@ subdir = icons/scalable -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +137,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -171,6 +231,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -322,8 +383,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -338,11 +402,11 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -481,16 +545,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff -Nru thunar-volman-0.6.1/INSTALL thunar-volman-0.8.1/INSTALL --- thunar-volman-0.6.1/INSTALL 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/INSTALL 2015-02-28 17:59:10.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -Nru thunar-volman-0.6.1/install-sh thunar-volman-0.8.1/install-sh --- thunar-volman-0.6.1/install-sh 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/install-sh 2015-02-28 17:59:10.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff -Nru thunar-volman-0.6.1/ltmain.sh thunar-volman-0.8.1/ltmain.sh --- thunar-volman-0.6.1/ltmain.sh 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/ltmain.sh 2015-02-28 17:59:07.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru thunar-volman-0.6.1/Makefile.am thunar-volman-0.8.1/Makefile.am --- thunar-volman-0.6.1/Makefile.am 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/Makefile.am 2015-02-26 13:51:20.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id$ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ icons \ @@ -9,7 +9,7 @@ distclean-local: rm -rf *.cache *~ -distuninstallcheck_listfiles = \ +distuninstallcheck_listfiles = \ find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache .PHONY: ChangeLog diff -Nru thunar-volman-0.6.1/Makefile.in thunar-volman-0.8.1/Makefile.in --- thunar-volman-0.6.1/Makefile.in 2012-03-28 16:34:47.000000000 +0000 +++ thunar-volman-0.8.1/Makefile.in 2015-02-28 17:59:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -14,9 +13,52 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $Id$ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,37 +79,77 @@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - THANKS config.guess config.sub depcomp install-sh ltmain.sh \ - missing mkinstalldirs +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in COPYING THANKS TODO compile config.guess \ + config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -78,6 +160,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -103,8 +186,9 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_TARGETS = dist-bzip2 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print @@ -200,6 +284,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -303,6 +388,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ icons \ po \ @@ -363,8 +449,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -387,22 +473,25 @@ -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -417,57 +506,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -483,12 +527,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -500,15 +539,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -517,9 +552,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -555,13 +612,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -593,40 +647,41 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -637,8 +692,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -650,18 +703,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -684,7 +738,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -820,25 +874,24 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-local distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-local distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am distclean-local: diff -Nru thunar-volman-0.6.1/missing thunar-volman-0.8.1/missing --- thunar-volman-0.6.1/missing 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/missing 2015-02-28 17:59:10.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru thunar-volman-0.6.1/mkinstalldirs thunar-volman-0.8.1/mkinstalldirs --- thunar-volman-0.6.1/mkinstalldirs 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/mkinstalldirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru thunar-volman-0.6.1/NEWS thunar-volman-0.8.1/NEWS --- thunar-volman-0.6.1/NEWS 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/NEWS 2015-02-28 17:58:42.000000000 +0000 @@ -1,3 +1,42 @@ +0.8.1 +===== +- Workaround: Wait 5 second before mounting devices (bug #9193) +- Use new show help function instead of thunar help (bug #10204) +- Fix AC_CONFIG_MACRO_DIR warning +- Remove SVN $Id$ and update .gitignore +- Bump autotools versions +- Fix AC_PROG_INTLTOOL warning +- Enable silent rules +- Don't use deprecated API +- Translation updates: Albanian, Arabic, Asturian, Basque, Bulgarian, + Catalan, Chinese (China), Chinese (Taiwan), Croatian, Czech, Danish, + Dutch (Flemish), English (Australia), English (Great Britain), + Finnish, French, Galician, German, Greek, Hebrew, Hungarian, + Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean, Latvian, + Lithuanian, Norwegian Bokmål, Norwegian Nynorsk, Polish, Portuguese, + Portuguese (Brazilian), Romanian, Russian, Serbian, Slovak, + Slovenian, Spanish, Swedish, Telugu, Turkish, Ukrainian, Urdu, Urdu + (Pakistan), Uyghur, Vietnamese + +0.8.0 +===== +- Translation updates: English (United Kingdom), Japanese, Korean, + Dutch (Flemish), Portuguese (Brazilian), Romanian, Chinese (China). + + +0.7.1 +===== +- Translation updates: Greek, Finnish, Galician, Croatian, Japanese, + Korean, Dutch (Flemish), Polish, Portuguese, Portuguese (Brazilian), + Turkish. + + +0.7.0 +===== +- Show in correct settings category. +- Drop AC_PROG_LIBTOOL/AC_DISABLE_STATIC for LT_PREREQ and LT_INIT. + + 0.6.1 ===== - Do not make icon names translatable. diff -Nru thunar-volman-0.6.1/po/ar.po thunar-volman-0.8.1/po/ar.po --- thunar-volman-0.6.1/po/ar.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ar.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,30 +1,35 @@ -# كريم اولاد الشلحة , 2012. -# Mohammad Alhargan , 2012. -# Mohammad Alhargan , 2012. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Karim Oulad Chalha , 2012-2013 +# محمد الحرقان , 2012 +# mohammad alhargan , 2012 +# mohammad alhargan , 2012 +# Karim Oulad Chalha , 2013 +# Karim Oulad Chalha , 2012 +# محمد الحرقان , 2012-2013 msgid "" msgstr "" "Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 04:48+0000\n" -"PO-Revision-Date: 2012-02-08 08:13+0300\n" -"Last-Translator: Mohammad Alhargan \n" -"Language-Team: http://www.vertaal.com.ar/files/opensuse-11-4/ar/list/\n" -"Language: ar\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-30 10:04+0000\n" +"Last-Translator: mohammad alhargan \n" +"Language-Team: Arabic (http://www.transifex.com/projects/p/xfce/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Virtaal 0.7.0\n" -"X-Poedit-Language: Arabic\n" -"X-Poedit-Country: Morroco\n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "مسار syfs للجهاز المضاف حديثا" +msgid "The sysfs path of the newly added device" +msgstr "مسار ملف sysfs للجهاز المضافة حديثا" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "إعداد إدارة الأجهزة و الوسائط المتنقلة" @@ -38,21 +43,21 @@ msgid "Thunar Volume Manager" msgstr "مدير الأجهزة تونار" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "كل الحقوق محفوظة." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." -msgstr "الرجاء التبليغ عن الخلل في <%s>." +msgstr "الرجاء التبليغ عن علة في <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "لا يوجد جهاز بمسارsysfs \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "يجب تجديد مسار sysfs للأجهزة الجديدة بـ --device-added" @@ -64,7 +69,7 @@ #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" -msgstr "تم العثور على صور في جهاز تشغيل الموسيقى المحمول خاصتك" +msgstr "تم العثور على صور في مُشغل الموسيقى المحمول" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -87,7 +92,7 @@ #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" -msgstr "غدارة ملفات الموسيقى" +msgstr "إدارة ملفات الموسيقى" #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 @@ -163,7 +168,7 @@ #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "تم وثل الجهاز" +msgstr "تم وصل الجهاز" #: ../thunar-volman/tvm-block-device.c:635 #, c-format @@ -212,13 +217,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "نوع كتلة الجهاز غير معروفة" +msgid "Unknown block device type \"%s\"" +msgstr "نوع كتلة الجهاز \"%s\" مجهولة" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "نوع الجهاز غير مدعوم" +msgid "Device type \"%s\" not supported" +msgstr "نوع الجهاز \"%s\" غير مدعوم" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -248,8 +253,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "نوع جهاز الإدخال غير معتمد" +msgid "Unsupported input device type \"%s\"" +msgstr "نوع جهاز الإدخال \"%s\" غير مدعوم" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -291,7 +296,7 @@ #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "أمر الحرق لا يجب أن يكون فارغاً" +msgstr "أمر الحرق يجب أن لا يكون فارغاً" #: ../thunar-volman/tvm-run.c:268 #, c-format @@ -316,15 +321,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "نوع جهاز USB غير مدعوم" +msgid "Unsupported USB device type \"%s\"" +msgstr "نوع جهاز USB \"%s\" غير مدعوم" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "إعدادات مدير الأجهزة تونار" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "أجهزة و وسائط متنقلة" @@ -357,16 +362,15 @@ msgid "Shell Scripts" msgstr "سكريبت شيل" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "وحدة التخزين" #: ../thunar-volman-settings/tvm-preferences-dialog.c:141 msgid "Removable Storage" -msgstr "وحدة التخزين المتنقلة" +msgstr "وحدة تخزين متنقلة" #: ../thunar-volman-settings/tvm-preferences-dialog.c:158 msgid "_Mount removable drives when hot-plugged" @@ -404,9 +408,8 @@ msgid "Command for A_udio CDs:" msgstr "أمر ل_أقراص صوتية:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "وسائط متعددة" @@ -417,7 +420,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "تشغيل أقراص صوتية عنذ إدخالها" +msgstr "تشغيل الأقراص صوتية عند إدخالها" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -448,11 +451,10 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" -msgstr "تشغيل ملفات الموسيقى عنذ وصلها" +msgstr "تشغيل ملفات الموسيقى عند وصلها" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "كاميرات" @@ -465,9 +467,8 @@ msgid "Import digital photographs when connected" msgstr "استيراد الصور الرقمية عند التوصيل" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -488,9 +489,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "مزامنة اجهزة Pocket P_C عنذ وصلها" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -500,9 +500,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "تشغيل البرنامج تلقائيا عند وصل طابعة" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "أجهزة الإدخال" diff -Nru thunar-volman-0.6.1/po/ast.po thunar-volman-0.8.1/po/ast.po --- thunar-volman-0.6.1/po/ast.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ast.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,55 +1,63 @@ -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# enolp , 2014-2015 +# Ḷḷumex03 , 2014 +# Ḷḷumex03 , 2014 +# Ḷḷumex03 , 2014 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2009-07-13 19:55+0100\n" -"Last-Translator: Marcos Antonio Alvarez Costales \n" -"Language-Team: Asturian \n" -"Language: ast\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2015-02-23 00:14+0000\n" +"Last-Translator: enolp \n" +"Language-Team: Asturian (http://www.transifex.com/projects/p/thunar-volman/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ast\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -#, fuzzy -msgid "The syfs path of the newly added device" -msgstr "L'UDI de preséu HAL del nuevu preséu amestáu" +msgid "The sysfs path of the newly added device" +msgstr "El camín sysfs del preséu recién amestáu" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "Configurar la xestión de preseos y soportes estrayíbles" +msgstr "Configurar l'alministración d'unidaes estrayibles y medios" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "Amosar la información de versión y colar" +msgstr "Amuesa la información de versión y cola" #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Xestor de volúmenes de Thunar" +msgstr "Xestor de volúmenes Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." -msgstr "" +msgstr "Tolos drechos reservaos." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, informa de fallos a <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "" +msgstr "Nun hai dengún preséu col camín sysfs \"%s\"" -#: ../thunar-volman/main.c:186 -#, fuzzy, c-format +#: ../thunar-volman/main.c:188 +#, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "Tien d'especificar el nuevu UDI de preséu HAL con --device-added" +msgstr "Tien d'especificase'l camín sysfs de los preseos nuevos con --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -57,13 +65,12 @@ msgstr "Semeyes y música" #: ../thunar-volman/tvm-block-device.c:205 -#, fuzzy msgid "Photos were found on your portable music player" -msgstr "Atopáronse semeyes nel to reproductor de música portátil." +msgstr "Nun s'alcontraron semeyes nel to reproductor de música portátil" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" -msgstr "¿Quies importar les semeyes o xestionar la música?" +msgstr "¿Prestaríate importar les semeyes o alministrar la música?" #: ../thunar-volman/tvm-block-device.c:208 #: ../thunar-volman/tvm-block-device.c:277 @@ -78,27 +85,26 @@ #: ../thunar-volman/tvm-block-device.c:209 #: ../thunar-volman/tvm-block-device.c:278 msgid "Import _Photos" -msgstr "Importar les seme_yes" +msgstr "Importar seme_yes" #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" -msgstr "Xestionar la _música" +msgstr "Alministrar _música" #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 msgid "Photo Import" -msgstr "Importar de semeyes" +msgstr "Importación de semeyes" #: ../thunar-volman/tvm-block-device.c:274 -#, fuzzy msgid "A photo card has been detected" -msgstr "Deteutóse una tarxeta con semeyes." +msgstr "Deteutóse una tarxeta de semeyes" #: ../thunar-volman/tvm-block-device.c:275 msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "Hai semeyes na tarxeta. ¿Quies amestar estes semeyes al to álbum?" +msgstr "Hai semeyes na tarxeta. ¿Prestaríate amestar estes semeyes al to álbum?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -106,36 +112,36 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "¿Quies permitir que s'execute \"%s\"?" +msgstr "¿Prestaríate permitir que s'execute \"%s\" ?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 msgid "Auto-Run Confirmation" -msgstr "Confirmación d'auto-execución" +msgstr "Confirmación d'execución automática" #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid "Auto-Run capability detected" -msgstr "Capacidá d'auto-execución deteutada" +msgstr "Capacidá d'execución automática deteutada" #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 msgid "_Allow Auto-Run" -msgstr "Permitir l'_auto-execución" +msgstr "Permitir la execución automática" #. prompt the user whether to autoopen this file #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "¿Quies abrir \"%s\"?" +msgstr "¿Prestaríate abrir \"%s\"?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" -msgstr "Confirmación d'auto-apertura" +msgstr "Confirmación d'apertura automática" #: ../thunar-volman/tvm-block-device.c:506 msgid "Auto-Open capability detected" -msgstr "Capacidá d'auto-apertura deteutada" +msgstr "Capacidá d'apertura automática deteutada" #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" @@ -143,62 +149,60 @@ #: ../thunar-volman/tvm-block-device.c:619 msgid "CD mounted" -msgstr "" +msgstr "CD montáu" #: ../thunar-volman/tvm-block-device.c:619 msgid "DVD mounted" -msgstr "" +msgstr "DVD montáu" #: ../thunar-volman/tvm-block-device.c:621 msgid "The CD was mounted automatically" -msgstr "" +msgstr "El CD montóse automáticamente" #: ../thunar-volman/tvm-block-device.c:622 msgid "The DVD was mounted automatically" -msgstr "" +msgstr "El DVD montóse automáticamente" #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "" +msgstr "Volume montáu" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "" +msgstr "El volume \"%s\" montóse automáticamente" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "" +msgstr "El volume inxertáu montóse automáticamente" #: ../thunar-volman/tvm-block-device.c:694 #, c-format msgid "Unable to locate mount point" -msgstr "" +msgstr "Nun pue allugase'l puntu de montaxe" #: ../thunar-volman/tvm-block-device.c:740 #, c-format msgid "Unable to mount the device" -msgstr "" +msgstr "Nun pue montase'l preséu" #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "" +msgstr "Nun pudo deteutase'l volume que correspuende al preséu" #: ../thunar-volman/tvm-block-device.c:824 -#, fuzzy msgid "Audio/Data CD" msgstr "CD d'audiu / datos" #: ../thunar-volman/tvm-block-device.c:825 -#, fuzzy msgid "The CD in the drive contains both music and files" -msgstr "El CD dientro del preséu caltién música y ficheros." +msgstr "El CD dientro'l llector caltien música y ficheros" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "¿Quies escuchar música o ver los ficheros?" +msgstr "¿Prestaríate escuchar música o restolar ficheros?" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" @@ -210,150 +214,126 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "" +msgid "Unknown block device type \"%s\"" +msgstr "Triba de bloque de preséu \"%s\" desconocida" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "" - -#: ../thunar-volman/tvm-input-device.c:74 -#, fuzzy -msgid "input-keyboard" -msgstr "Teclaos" +msgid "Device type \"%s\" not supported" +msgstr "La triba de preséu \"%s\" nun ta sofitada" #: ../thunar-volman/tvm-input-device.c:75 -#, fuzzy msgid "Keyboard detected" -msgstr "Teclaos" +msgstr "Tecláu deteutáu" #: ../thunar-volman/tvm-input-device.c:76 -#, fuzzy msgid "A keyboard was detected" -msgstr "Deteutóse una tarxeta con semeyes." - -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "" +msgstr "Deteutóse un tecláu" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 -#, fuzzy msgid "Tablet detected" -msgstr "Capacidá d'auto-execución deteutada" +msgstr "Tableta deteutada" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "" - -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" +msgstr "Deteutóse una tableta gráfica" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" -msgstr "" +msgstr "Mur deteutáu" #: ../thunar-volman/tvm-input-device.c:112 msgid "A mouse was detected" -msgstr "" +msgstr "Deteutóse un mur" #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "" +msgid "Unsupported input device type \"%s\"" +msgstr "Triba de preséu d'entrada \"%s\" non sofitada" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "" +msgstr "La grabación automática de CDs y DVDs vírxenes ta deshabilitada" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" -msgstr "" +msgstr "DVD virxe inxertáu" #: ../thunar-volman/tvm-run.c:190 -#, fuzzy msgid "You have inserted a blank DVD." -msgstr "Inxertásti un discu virxen." +msgstr "Inxertesti un DVD virxe." #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" -msgstr "¿Qué quies facer?" +msgstr "¿Qué te prestaría facer?" #: ../thunar-volman/tvm-run.c:193 msgid "Burn _DVD" -msgstr "" +msgstr "Grabar _DVD" #: ../thunar-volman/tvm-run.c:200 -#, fuzzy msgid "Blank CD inserted" -msgstr "Desaniciar CDs y DVDs" +msgstr "CD virxe inxertáu" #: ../thunar-volman/tvm-run.c:201 -#, fuzzy msgid "You have inserted a blank CD." -msgstr "Inxertásti un discu virxen." +msgstr "Inxertesti un CD virxe." #: ../thunar-volman/tvm-run.c:204 -#, fuzzy msgid "Burn _Data CD" -msgstr "Criar un CD de _datos" +msgstr "Grabar un _CD de datos" #: ../thunar-volman/tvm-run.c:205 -#, fuzzy msgid "Burn _Audio CD" -msgstr "Criar un CD d'_audiu" +msgstr "Grabar un CD d'_audiu" #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "" +msgstr "El comandu de grabación nun pue tar baleru" #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "" +msgstr "El comandu del reproductor de CDs nun ta definíu" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" -msgstr "" +msgstr "Cámara deteutada" #: ../thunar-volman/tvm-usb-device.c:63 -#, fuzzy msgid "A photo camera was detected" -msgstr "Deteutóse una tarxeta con semeyes." +msgstr "Deteutóse una cámara" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" -msgstr "" +msgstr "Imprentadora deteutada" #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "" +msgstr "Deteutóse una imprentadora USB" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "" +msgid "Unsupported USB device type \"%s\"" +msgstr "Triba de preséu USB \"%s\" non sofitada" #. setup application name #: ../thunar-volman-settings/main.c:52 -#, fuzzy msgid "Thunar Volume Manager Settings" -msgstr "Xestor de volúmenes de Thunar" +msgstr "Axustes del xestor de volúmenes Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" -msgstr "Preseos y soportes estrayíbles" +msgstr "Unidaes y medios estrayíbles" #: ../thunar-volman-settings/tvm-command-entry.c:240 msgid "Select an Application" -msgstr "Seleicionar una aplicación" +msgstr "Esbillar una aplicación" #: ../thunar-volman-settings/tvm-command-entry.c:250 msgid "All Files" @@ -379,40 +359,38 @@ msgid "Shell Scripts" msgstr "Scripts de shell" -#. #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" -msgstr "Atroxu" +msgstr "Almacenamientu" #: ../thunar-volman-settings/tvm-preferences-dialog.c:141 msgid "Removable Storage" -msgstr "Atroxu estrayíble" +msgstr "Almacenamientu estrayíble" #: ../thunar-volman-settings/tvm-preferences-dialog.c:158 msgid "_Mount removable drives when hot-plugged" -msgstr "_Montar los preseos estrayíbles al coneutase" +msgstr "_Montar les unidaes estrayíbles al coneutase" #: ../thunar-volman-settings/tvm-preferences-dialog.c:166 msgid "Mount removable media when _inserted" -msgstr "Montar unidá estrayíble al _inxertala" +msgstr "Montar mediu estrayíble al _inxertalu" #: ../thunar-volman-settings/tvm-preferences-dialog.c:174 msgid "B_rowse removable media when inserted" -msgstr "Res_tolar unidá estrayíble al inxertala" +msgstr "Res_tolar mediu estrayíble al inxertalu" #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" -msgstr "_Auto-execución de programes en nuevos preseos y unidaes" +msgstr "Execución _automática de programes n'unidaes y medios nuevos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" -msgstr "Auto-apertura de ficheros en nuevos preseos y unidaes" +msgstr "Apertura automática de ficheros n'unidaes y medios nuevos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" -msgstr "Desaniciar CDs y DVDs" +msgstr "CDs y DVDs vírxenes" #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" @@ -426,9 +404,7 @@ msgid "Command for A_udio CDs:" msgstr "Comandu pa los CDs d'a_udiu:" -#. #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" @@ -439,7 +415,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "Reproducir CDs d'_audiu al inxertar" +msgstr "Reproducir CDs d'_audiu cuando s'inxerten" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -455,7 +431,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:321 msgid "Play _video CDs and DVDs when inserted" -msgstr "Reproducir CDs y DVDs de _vídeu al inxertar" +msgstr "Reproducir CDs y DVDs de _videu cuando s'inxerten" #: ../thunar-volman-settings/tvm-preferences-dialog.c:329 #: ../thunar-volman-settings/tvm-preferences-dialog.c:367 @@ -470,11 +446,9 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" -msgstr "Reproducir ficheros de _música al coneutar" +msgstr "Reproducir ficheros de _música cuando se coneute" -#. #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Cámares" @@ -485,11 +459,9 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "Importar semeyes dixitales al coneutar" +msgstr "Importar semeyes dixitales al coneutar la cámara" -#. #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -500,7 +472,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:458 msgid "Sync _Palm™ devices when connected" -msgstr "Sincronizar preseos _Palm™ al coneutar" +msgstr "Sincronizar preseos _Palm™ al coneutalos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" @@ -508,11 +480,9 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" -msgstr "Sincronizar preseos Pocket P_C al coneutar" +msgstr "Sincronizar preseos Pocket P_C al coneutalos" -#. #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -522,9 +492,7 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Executar automáticamente un programa al coneutar una im_prentadora" -#. #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Preseos d'entrada" @@ -534,27 +502,24 @@ msgstr "Teclaos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "Executar automáticamente un programa al coneutar un te_cláu USB" +msgstr "Executar automáticamente un programa al coneutar un _tecláu USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Mures" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" msgstr "Executar automáticamente un programa al coneutar un _mur USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" -msgstr "Tableta gráfica" +msgstr "Tableta" #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "" -"Executar automáticamente un programa cuando se coneute una _tableta gráfica" +msgstr "Executar automáticamente un programa al coneutar una _tableta" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" @@ -562,59 +527,4 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" -msgstr "Fallu al abrir el visor de documentación" - -#~ msgid "Failed to open display" -#~ msgstr "Fallu al abrir display" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "L'equipu de desendolcu de Thunar. Tolos drechos reservaos." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Escritu por Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "L'UDI \"%s\" especificáu nun ye un UDI de preséu HAL válidu." - -#~ msgid "Encrypted volume" -#~ msgstr "Volume cifráu" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Montando volume cifráu..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Configurando la capa de cifráu..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Nun tienes privilexos pa configurar la capa de cifráu" - -#~ msgid "Wrong password" -#~ msgstr "Contraseña incorreuta" - -#~ msgid "Wrong password." -#~ msgstr "Contraseña incorreuta." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "Esti volume ta cifráu." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Por favor, introduz la to contraseña pa descifrar y montar el volume." - -#~ msgid "_Mount" -#~ msgstr "_Montar" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Fallu al configurar el volume cifráu" - -#~ msgid "Choose Disc Type" -#~ msgstr "Escoyer la triba de discu" - -#~ msgid "Make _DVD" -#~ msgstr "Criar un _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Unidaes estrayíbles" +msgstr "Fallu al abrir el restolador de documentación" diff -Nru thunar-volman-0.6.1/po/be.po thunar-volman-0.8.1/po/be.po --- thunar-volman-0.6.1/po/be.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/be.po 2015-02-26 13:26:46.000000000 +0000 @@ -2,20 +2,20 @@ # Copyright (C) 2011 THE thunar-volman'S COPYRIGHT HOLDER # This file is distributed under the same license as the thunar-volman package. # Andrei Zakharevich , 2011. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: thunar-volman 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" +"POT-Creation-Date: 2012-05-04 12:45+0000\n" "PO-Revision-Date: 2011-06-22 21:16+0200\n" "Last-Translator: Andrei Zakharevich \n" "Language-Team: Andrei Zakharevich \n" -"Language: BE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: BE\n" #: ../thunar-volman/main.c:59 msgid "The syfs path of the newly added device" @@ -32,25 +32,25 @@ msgstr "Паказаць інфармацыю пра версію і выйсці" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Кіраўнік Тамоў Thunar" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:119 msgid "All rights reserved." msgstr "Усе права абароненыя." -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:120 #, c-format msgid "Please report bugs to <%s>." msgstr "Калі ласка, дасылайце паведамллені пра памылкі да <%s>." -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:174 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Не існуе прылады з шляхам sysfs \"%s\"" -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:186 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Вы павінны задаць шлях sysfs для новых прылад з --device-added" @@ -153,7 +153,7 @@ #: ../thunar-volman/tvm-block-device.c:621 msgid "The CD was mounted automatically" -msgstr "" +msgstr "CD быў падмантаваны аўтаматычна" #: ../thunar-volman/tvm-block-device.c:622 msgid "The DVD was mounted automatically" @@ -218,10 +218,6 @@ msgid "Device type not supported" msgstr "" -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" msgstr "" @@ -230,11 +226,6 @@ msgid "A keyboard was detected" msgstr "" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -245,10 +236,6 @@ msgid "A graphics tablet was detected" msgstr "" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "" @@ -368,9 +355,8 @@ msgid "Shell Scripts" msgstr "" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "" @@ -415,9 +401,8 @@ msgid "Command for A_udio CDs:" msgstr "" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "" @@ -461,9 +446,8 @@ msgid "Play _music files when connected" msgstr "" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "" @@ -476,9 +460,8 @@ msgid "Import digital photographs when connected" msgstr "" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "" @@ -499,9 +482,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -511,9 +493,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "" @@ -523,7 +504,7 @@ msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" +msgid "Automatically run a program when a USB _keyboard is connected" msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 @@ -531,7 +512,7 @@ msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" +msgid "Automatically run a program when a USB _mouse is connected" msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 diff -Nru thunar-volman-0.6.1/po/bg.po thunar-volman-0.8.1/po/bg.po --- thunar-volman-0.6.1/po/bg.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/bg.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,58 +1,58 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# +# +# Translators: +# Kiril Kirilov , 2013 +# Lyubomir Vasilev, 2015 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" -"PO-Revision-Date: 2011-12-30 02:14+0200\n" -"Last-Translator: Milen Milev \n" -"Language-Team: BULGARIAN\n" -"Language: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2015-02-23 06:52+0000\n" +"Last-Translator: Lyubomir Vasilev\n" +"Language-Team: Bulgarian (http://www.transifex.com/projects/p/thunar-volman/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: BULGARIAN\n" -"X-Poedit-Country: BULGARIA\n" -"X-Poedit-SourceCharset: utf-8\n" +"Language: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 msgid "The sysfs path of the newly added device" -msgstr "sysfs пътя на ново добавено устройство" +msgstr "Sysfs пътя на ново добавено устройство" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "Конфигурирай управлението на преносими устройства" +msgstr "Конфигуриране на управлението на преносими устройства и медии" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "Изписва инфо за версията и изход" +msgstr "Изписване на информация за версията и изход" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Файлов мениджър Thunar." +msgstr "Thunar - Управление на устройствата" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." -msgstr "Всички права запазени." +msgstr "Всички права са запазени." -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." -msgstr "Докладвайте за грешки на <%s>." +msgstr "Моля, докладвайте за грешки на <%s>." -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "Няма устройство със sysfs път \"%s\"" +msgstr "Няма устройство със sysfs път „%s“" -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Да се зададе sysfs път за новите устройства с --device-added" @@ -64,7 +64,7 @@ #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" -msgstr "Засечени са снимки на музикалният Ви плейър" +msgstr "Засечени са снимки на вашият портативен музикален плейър" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -75,8 +75,7 @@ #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid "Ig_nore" msgstr "Пропусни" @@ -88,19 +87,21 @@ #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" -msgstr "Редактиране на песни" +msgstr "Управление на Музика" #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 msgid "Photo Import" -msgstr "Внасяне на снимки" +msgstr "Снимки - внасяне" #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" msgstr "Засечена е карта със снимки" #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" msgstr "Има снимки на картата. Искате ли да ги добавите към Вашия албум?" #. prompt the user to execute the file @@ -109,7 +110,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "Позволявате ли на \"%s\" да се стартира?" +msgstr "Позволявате ли на „%s“ да стартира?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -130,7 +131,7 @@ #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "Искате ли да отворите \"%s\"?" +msgstr "Искате ли да отворите „%s“?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" @@ -142,7 +143,7 @@ #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" -msgstr "Отвори" +msgstr "Отваряне" #: ../thunar-volman/tvm-block-device.c:619 msgid "CD mounted" @@ -167,7 +168,7 @@ #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "Устройството \"%s\" е монтирано автоматично" +msgstr "Устройството „%s“ е монтирано автоматично" #: ../thunar-volman/tvm-block-device.c:640 #, c-format @@ -191,7 +192,7 @@ #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "Аудио/Данни диск" +msgstr "Аудио/CD с данни" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" @@ -211,17 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Непознат тип на блоково устройство" +msgid "Unknown block device type \"%s\"" +msgstr "Непознато блоково устройство тип „%s“" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Типа на устройството не се поддържа" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "въвеждане-клавиатура" +msgid "Device type \"%s\" not supported" +msgstr "Устройство тип „%s“ не се поддържа" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -231,11 +228,6 @@ msgid "A keyboard was detected" msgstr "Беше засечена клавиатура" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "въвеждане-таблет" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -246,10 +238,6 @@ msgid "A graphics tablet was detected" msgstr "Засечен е графичен таблет" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "въвеждане-мишка" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "Засечена е мишка" @@ -260,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Неподдържан тип на входно устройство" +msgid "Unsupported input device type \"%s\"" +msgstr "Неподдържано входно устройство тип „%s“" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -276,8 +264,7 @@ msgid "You have inserted a blank DVD." msgstr "Вкарали сте празно DVD. " -#: ../thunar-volman/tvm-run.c:191 -#: ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" msgstr "Какво искате да направите?" @@ -329,22 +316,22 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Неподдържан тип на USB устройство" +msgid "Unsupported USB device type \"%s\"" +msgstr "Неподдържано USB устройство тип „%s“" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Настройки на управлението на устройства в Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Преносими устройства и медии" #: ../thunar-volman-settings/tvm-command-entry.c:240 msgid "Select an Application" -msgstr "Избери програма" +msgstr "Избор на програма" #: ../thunar-volman-settings/tvm-command-entry.c:250 msgid "All Files" @@ -370,9 +357,7 @@ msgid "Shell Scripts" msgstr "Shell скриптове" -#. #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Система за съхраняване на данни" @@ -417,9 +402,7 @@ msgid "Command for A_udio CDs:" msgstr "Команда за аудио дискове:" -#. #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Мултимедия" @@ -463,9 +446,7 @@ msgid "Play _music files when connected" msgstr "Пусни музикалните файлове при свързване" -#. #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Камери" @@ -478,9 +459,7 @@ msgid "Import digital photographs when connected" msgstr "Внеси цифрови снимки при свързване" -#. #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA-та" @@ -501,9 +480,7 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Синхронизирай PocketPC устройства при свързване" -#. #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -513,9 +490,7 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Стартирай автоматично програма при свързване на принтер" -#. #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Входни устройства" @@ -525,16 +500,16 @@ msgstr "Клавиатури" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" -msgstr "Стартирай автоматично програма при свързване на USB клавиатура" +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "Автоматично стартиране на програма при свързване на USB клавиатура" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Мишка" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" -msgstr "Стартирай автоматично програма при свързване на USB мишка" +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Автоматично стартиране на програма при свързване на USB мишка" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -551,4 +526,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Не може да се отвори браузъра за документи" - diff -Nru thunar-volman-0.6.1/po/ca.po thunar-volman-0.8.1/po/ca.po --- thunar-volman-0.6.1/po/ca.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ca.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,32 +1,29 @@ -# Catalan translations for thunar-volman package -# Traduccions al català del paquet «thunar-volman». -# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the thunar-volman -# package. -# Carles Muñoz Gorriz , 2008, 2012. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# carlesmu , 2008,2012-2013 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-15 15:30+0000\n" -"PO-Revision-Date: 2012-01-15 18:11+0100\n" -"Last-Translator: Carles Muñoz Gorriz \n" -"Language-Team: Catalan\n" -"Language: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/xfce/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Catalan\n" -"X-Poedit-SourceCharset: utf-8\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "El camí al dispositiu afegit recentment" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Configura la gestió dels dispositius i mitjans extraïbles" @@ -40,21 +37,21 @@ msgid "Thunar Volume Manager" msgstr "Gestor de volums de Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Tots els drets reservats" -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Envieu els errors a <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "No hi ha dispositiu en el camí \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Heu d'especificar el camí dels nous dispositius amb --device-added" @@ -77,8 +74,7 @@ #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid "Ig_nore" msgstr "Ig_nora" @@ -102,7 +98,9 @@ msgstr "S'ha detectat una tarjeta de fotografies." #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" msgstr "Hi han fotos a la targeta, Voleu afegir-les al vostre àlbum?" #. prompt the user to execute the file @@ -213,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Tipus de dispositiu de blocs desconegut" +msgid "Unknown block device type \"%s\"" +msgstr "Tipus de dispositiu de blocs «%s» desconegut" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Dispositiu no suportat" +msgid "Device type \"%s\" not supported" +msgstr "Tipus de dispositiu «%s» no compatible" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -249,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Tipus de dispositiu d'entrada no suportat" +msgid "Unsupported input device type \"%s\"" +msgstr "Tipus de dispositiu d'entrada «%s» no compatible" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -265,8 +263,7 @@ msgid "You have inserted a blank DVD." msgstr "Heu introduït un DVD en blanc" -#: ../thunar-volman/tvm-run.c:191 -#: ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" msgstr "Què voleu fer?" @@ -318,15 +315,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Tipus de dispositiu USB no suportat" +msgid "Unsupported USB device type \"%s\"" +msgstr "Tipus de dispositiu USB «%s» no compatible" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Propietats del gestor de volum Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Dispositius i mitjans extraïble" @@ -359,9 +356,8 @@ msgid "Shell Scripts" msgstr "Seqüències de l'intèrpret d'ordres" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Emmagatzematge" @@ -406,9 +402,8 @@ msgid "Command for A_udio CDs:" msgstr "Ordre pels CDs d'à_udio:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimèdia" @@ -452,9 +447,8 @@ msgid "Play _music files when connected" msgstr "Reprodueix els fitxers de _música quan es connectin" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Càmeres" @@ -467,9 +461,8 @@ msgid "Import digital photographs when connected" msgstr "Importa les fotos digitals quan es connecti" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "Organitzadors personals" @@ -490,9 +483,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Sincronitza els ordinadors de _butxaca quan es connectin" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -502,9 +494,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Executa automàticament un programa quan es connecti una _impressora" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Dispositius d'entrada" @@ -540,68 +531,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "No s'ha pogut obrir el visor de documentació" - -#~ msgid "input-keyboard" -#~ msgstr "entrada-teclat" - -#~ msgid "input-tablet" -#~ msgstr "entrada-taulagrafica" - -#~ msgid "input-mouse" -#~ msgstr "entrada-ratolí" - -#~ msgid "Failed to open display" -#~ msgstr "No s'ha pogut obrir la pantalla" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "L'equip de desenvolupament de Thunar. Tots els drets reservats." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Escrit per Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "El UDI «%s» indicat no és un UDI de dispositiu HAL" - -#~ msgid "Encrypted volume" -#~ msgstr "Volum xifrat" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Muntant un volum xifrat…" - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Configurant la capa de xifratge…" - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "No teniu pro privilegis per configurar la capa de xifratge" - -#~ msgid "Wrong password" -#~ msgstr "Contrasenya incorrecta" - -#~ msgid "Wrong password." -#~ msgstr "" -#~ "Contrasenya incorrecte." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Aquest volum està xifrat." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Introduïu la vostra contrasenya per desxifrar i muntar el volum." - -#~ msgid "_Mount" -#~ msgstr "_Munta" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "No s'ha pogut configurar el volum xifrat" - -#~ msgid "Choose Disc Type" -#~ msgstr "Seleccioneu el tipus de disc" - -#~ msgid "Make _DVD" -#~ msgstr "Fes un _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Medis extraïbles" diff -Nru thunar-volman-0.6.1/po/cs.po thunar-volman-0.8.1/po/cs.po --- thunar-volman-0.6.1/po/cs.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/cs.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,28 +1,29 @@ -# Czech translations for xfce package. -# Copyright (C) 2007 THE xfce'S COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce package. -# Michal Várady , 2007-2012. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Michal Várady , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce 4-i18-goodies\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-19 20:00+0000\n" -"PO-Revision-Date: 2012-02-19 22:27+0100\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-10-05 09:50+0000\n" "Last-Translator: Michal Várady \n" -"Language-Team: Czech\n" -"Language: \n" +"Language-Team: Czech (http://www.transifex.com/projects/p/xfce/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "Cesta sysfs nově přidaného zařízení" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Správa nastavení vyměnitelných jednotek a médií" @@ -36,21 +37,21 @@ msgid "Thunar Volume Manager" msgstr "Správce svazků aplikace Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Všechna práva vyhrazena." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Prosíme, abyste chyby hlásili na adresu <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Neexistuje zařízení s cestou sysfs \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Je nutné zadat novou cestu sysfs nového zařízení pomocí přepínače --device-added" @@ -73,8 +74,7 @@ #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid "Ig_nore" msgstr "Ig_norovat" @@ -98,7 +98,9 @@ msgstr "Byla nalezena karta s fotografiemi" #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" msgstr "Na kartě jsou fotografie. Chcete je přidat do svého alba?" #. prompt the user to execute the file @@ -209,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Naznámý typ blokového zařízení" +msgid "Unknown block device type \"%s\"" +msgstr "Neznámý typ blokového zařízení %s" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Typ zařízení není podporován" +msgid "Device type \"%s\" not supported" +msgstr "Typ zařízení %s není podporován" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -245,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Nepodporované typ vstupního zařízení" +msgid "Unsupported input device type \"%s\"" +msgstr "Nepodporovaný typ vstupního zařízení %s" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -261,8 +263,7 @@ msgid "You have inserted a blank DVD." msgstr "Vložili jste prázdný disk DVD." -#: ../thunar-volman/tvm-run.c:191 -#: ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" msgstr "Vyberte si z následujících možností" @@ -314,15 +315,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Nepodporovaný typ zařízení USB" +msgid "Unsupported USB device type \"%s\"" +msgstr "Nepodporovaný typ zařízení USB %s" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Nastavení Správce svazků aplikace Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Vyměnitelné jednotky a média" @@ -355,9 +356,8 @@ msgid "Shell Scripts" msgstr "Shellové skripty" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Úložiště" @@ -402,9 +402,8 @@ msgid "Command for A_udio CDs:" msgstr "Příkaz pro _zvukové disky CD:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimédia" @@ -448,9 +447,8 @@ msgid "Play _music files when connected" msgstr "Přehrát hudební _soubory po připojení" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Fotoaparáty" @@ -463,9 +461,8 @@ msgid "Import digital photographs when connected" msgstr "Importovat digitální fotografie po připojení" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "Zařízení PDA" @@ -486,9 +483,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Synchronizovat zařízení Pocket P_C po připojení" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -498,9 +494,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Au_tomaticky spustit program po připojení tiskárny" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Vstupní zařízení" @@ -536,70 +531,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Nepodařilo se otevřít prohlížeč dokumentace" - -#~ msgid "input-keyboard" -#~ msgstr "vstup-klávesnice" - -#~ msgid "input-tablet" -#~ msgstr "Vstup-tablet" - -#~ msgid "input-mouse" -#~ msgstr "vstup-myš" - -#~ msgid "Failed to open display" -#~ msgstr "Nepodařilo se otevřít displej" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Vývojový tým aplikace Thunar. Všechna práva vyhrazena." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Napsal Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "" -#~ "Zadaný identifikátor zařízení (UDI) \"%s\" není platným identifikátorem " -#~ "zařízení vrstvy HAL" - -#~ msgid "Encrypted volume" -#~ msgstr "Šifrovaný svazek" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Připojování šifrovaného svazku..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Nastavování šifrovací vrstvy..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Nemáte oprávnění nastavovat šifrovací vrstvu" - -#~ msgid "Wrong password" -#~ msgstr "Špatné heslo" - -#~ msgid "Wrong password." -#~ msgstr "Špatné heslo." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Tento svazek je šifrovaný." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Pro odšifrování a připojení svazku zadejte heslo." - -#~ msgid "_Mount" -#~ msgstr "_Připojit" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Nepodařilo se nastavit šifrovaný svazek" - -#~ msgid "Choose Disc Type" -#~ msgstr "Zvolte typ disku" - -#~ msgid "Make _DVD" -#~ msgstr "Vytvořit _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Vyměnitelná média" diff -Nru thunar-volman-0.6.1/po/da.po thunar-volman-0.8.1/po/da.po --- thunar-volman-0.6.1/po/da.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/da.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,30 +1,30 @@ -# Danish translation thunar-volman. -# Copyright (c) 2004-2007 The Thunar development team. All rights reserved. -# This file is distributed under the same license as the thunar-volman package. -# Per Kongstad , 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Aputsiaĸ Niels Janussen , 2013 +# Per Kongstad , 2008 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.3.80\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-19 21:18+0000\n" -"PO-Revision-Date: 2008-10-14 11:14+0100\n" -"Last-Translator: Per Kongstad \n" -"Language-Team: Danish \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-08 13:29+0000\n" +"Last-Translator: Aputsiaĸ Niels Janussen \n" +"Language-Team: Danish (http://www.transifex.com/projects/p/xfce/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: da\n" -"X-Poedit-Language: Danish\n" -"X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-Country: DENMARK\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Syfs-stien til den nylige tilsluttetede enhed" +msgid "The sysfs path of the newly added device" +msgstr "Syfs-stien til den nyligt tilsluttede enhed" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Indstillingshåndtering af fjernbare drev og medie" @@ -38,21 +38,21 @@ msgid "Thunar Volume Manager" msgstr "Thunar-arkivhåndtering" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Alle rettigheder er beskyttet." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapportér venligst fejl til <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Der findes ikke enhed med sysfs-stien \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Du skal angive den nye syfs sti af den nye enhed med --device-added" @@ -102,9 +102,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Der er billeder på hukommelseskortet. Vil du tilføje disse billeder til din " -"samling?" +msgstr "Der er billeder på hukommelseskortet. Vil du tilføje disse billeder til din samling?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -214,13 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Ukendt blokenhedstype" +msgid "Unknown block device type \"%s\"" +msgstr "Ukendt blokenhedstype \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Enhedstype ikke understøttet" +msgid "Device type \"%s\" not supported" +msgstr "Enhedstype \"%s\" ikke understøttet" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -250,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Ikke understøttet inddata-enhedstype" +msgid "Unsupported input device type \"%s\"" +msgstr "Ikke understøttet inddata-enhedstype \"%s\"" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -318,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Ikke understøttet usb-enhedstype" +msgid "Unsupported USB device type \"%s\"" +msgstr "Ikke understøttet usb-enhedstype \"%s\"" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Indstillinger af arkivhåndtering til Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Fjernbare drev og medier" @@ -534,68 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Kunne ikke åbne dokumentationsnavigator" - -#~ msgid "input-keyboard" -#~ msgstr "inddatatastatur" - -#~ msgid "input-tablet" -#~ msgstr "inddata-tablet" - -#~ msgid "input-mouse" -#~ msgstr "inddata-mus" - -#~ msgid "Failed to open display" -#~ msgstr "Kunne ikke åbne skærm" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Thunars udviklingshold. Alle rettigheder forbeholdt." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Skrevet af Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Det angivne UDI \"%s\" er ikke et gyldigt HAL-enheds UDI" - -#~ msgid "Encrypted volume" -#~ msgstr "Krypteret arkiv" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Monterer krypteret arkiv..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Indstiller krypteringslag..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Du har ikke rettigheder til at indstille krypteringslag" - -#~ msgid "Wrong password" -#~ msgstr "Forkert adgangskode" - -#~ msgid "Wrong password." -#~ msgstr "Forkert adgangskode." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Dette arkiv er krypteret." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Angiv venligst din adgangskode for at afkryptere og montere arkivet." - -#~ msgid "_Mount" -#~ msgstr "_Montér" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Kunne ikke indstille krypteret arkiv" - -#~ msgid "Choose Disc Type" -#~ msgstr "Vælg disktype" - -#~ msgid "Make _DVD" -#~ msgstr "Lav _dvd" - -#~ msgid "Removable Media" -#~ msgstr "Fjernbare medier" diff -Nru thunar-volman-0.6.1/po/de.po thunar-volman-0.8.1/po/de.po --- thunar-volman-0.6.1/po/de.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/de.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,30 +1,34 @@ -# German translations for thunar-volman. -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. -# Benedikt Meurer , 2007. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Benedikt Meurer , 2007 +# Georg Eckert , 2013 +# Tobias Bannert, 2013-2014 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-01 10:24+0000\n" -"PO-Revision-Date: 2007-01-15 21:19+0100\n" -"Last-Translator: Benedikt Meurer \n" -"Language-Team: German \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-09-17 21:12+0000\n" +"Last-Translator: Tobias Bannert\n" +"Language-Team: German (http://www.transifex.com/projects/p/thunar-volman/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Der Sysfs-Pfad des neu hinzugefügten Geräts" +msgid "The sysfs path of the newly added device" +msgstr "Der Sysfs-Pfad des neu hinzugefügten Gerätes" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "Handhabung von Wechseldatenträgern und -medien konfigurieren" +msgstr "Verwaltung von Wechseldatenträgern und -medien konfigurieren" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" @@ -33,23 +37,23 @@ #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Thunar Datenträgerverwaltung" +msgstr "Thunar-Datenträgerverwaltung" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Alle Rechte vorbehalten." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." -msgstr "Bitte melden Sie Probleme unter <%s>." +msgstr "Fehler bitte an <%s> melden." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "Es existiert kein Gerät mit dem Sysfs-Pfad »%s«" +msgstr "Es ist kein Gerät mit dem Sysfs-Pfad »%s« vorhanden" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Es muss ein Sysfs-Pfad mit --device-added angegeben werden" @@ -99,9 +103,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Auf diesem Medium sind Fotos vorhanden. Sollen diese Ihrem Fotoalbum " -"hinzugefügt werden?" +msgstr "Auf diesem Medium sind Fotos vorhanden. Sollen diese Ihrem Fotoalbum hinzugefügt werden?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -211,13 +213,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Unbekanntes blockorientiertes Gerät" +msgid "Unknown block device type \"%s\"" +msgstr "Unbekannter Blockgerätetyp \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Gerätetyp wird nicht unterstützt" +msgid "Device type \"%s\" not supported" +msgstr "Gerätetyp \"%s\" wird nicht unterstützt" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -247,8 +249,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Nicht unterstützter Gerätetyp" +msgid "Unsupported input device type \"%s\"" +msgstr "Nicht unterstützter Eingabegerätetyp \"%s\"" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -315,15 +317,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Nicht unterstützter USB Gerätetyp" +msgid "Unsupported USB device type \"%s\"" +msgstr "Nicht unterstützter USB-Gerätetyp \"%s\"" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Einstellungen der Thunar Datenträgerverwaltung" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Wechseldatenträger- und Medieneinstellungen" @@ -357,7 +359,6 @@ msgstr "Shell Skripte" #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Datenträger" @@ -403,7 +404,6 @@ msgstr "Befehl für A_udio-CDs:" #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Unterhaltungsmedien" @@ -448,7 +448,6 @@ msgstr "Nach dem Verbinden _Musikdateien abspielen" #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Kameras" @@ -462,7 +461,6 @@ msgstr "Nach dem Verbinden digitale Fotos _importieren" #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -484,7 +482,6 @@ msgstr "Nach dem Verbinden Daten mit _PocketPCs abgleichen" #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -495,7 +492,6 @@ msgstr "Automatisch ein Programm ausführen, wenn ein _Drucker eingesteckt wird" #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Eingabegeräte" @@ -506,8 +502,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "" -"Automatisch ein Programm ausführen, wenn eine USB-_Tastatur eingesteckt wird" +msgstr "Automatisch ein Programm ausführen, wenn eine USB-_Tastatur eingesteckt wird" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" @@ -515,8 +510,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 msgid "Automatically run a program when a USB _mouse is connected" -msgstr "" -"Automatisch ein Programm ausführen, wenn eine USB-_Maus eingesteckt wird" +msgstr "Automatisch ein Programm ausführen, wenn eine USB-_Maus eingesteckt wird" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -524,8 +518,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "" -"Automatisch ein Programm ausführen, wenn ein _Grafiktablett eingesteckt wird" +msgstr "Automatisch ein Programm ausführen, wenn ein _Grafiktablett eingesteckt wird" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" @@ -534,72 +527,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Die Dokumentation konnte nicht angezeigt werden" - -#~ msgid "input-keyboard" -#~ msgstr "Eingabe-Tastatur" - -#~ msgid "input-tablet" -#~ msgstr "Tabletts" - -#~ msgid "input-mouse" -#~ msgstr "Eingabe-Maus" - -#~ msgid "Failed to open display" -#~ msgstr "Konnte keine Verbindung zum XServer herstellen" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Die Thunar Entwickler. Alle Rechte vorbehalten." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Entwickelt von Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Der angegebene UDI »%s« ist kein gültiger HAL UDI" - -#~ msgid "Encrypted volume" -#~ msgstr "Verschlüsselter Datenträger" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Verschlüsselten Datenträger " -#~ "einhängen..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Verschlüsselungsschicht aufsetzen..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "" -#~ "Sie sind nicht dazu berechtigt, die Verschlüsselungsschicht einzurichten" - -#~ msgid "Wrong password" -#~ msgstr "Falsches Passwort" - -#~ msgid "Wrong password." -#~ msgstr "Falsches Passwort." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Dieser Datenträger ist " -#~ "verschlüsselt." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Bitte geben Sie Ihr Passwort ein, um den Datenträger zu entschlüsseln und " -#~ "einzuhängen." - -#~ msgid "_Mount" -#~ msgstr "_Einhängen" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Konnte den verschlüsselten Datenträger nicht einrichten" - -#~ msgid "Choose Disc Type" -#~ msgstr "Medientyp auswählen" - -#~ msgid "Make _DVD" -#~ msgstr "_DVD brennen" - -#~ msgid "Removable Media" -#~ msgstr "Wechselmedien" diff -Nru thunar-volman-0.6.1/po/el.po thunar-volman-0.8.1/po/el.po --- thunar-volman-0.6.1/po/el.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/el.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,33 +1,32 @@ -# thunar-volman translation to Greek. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Evaggelos Balaskas , 2009. -# Stavros Giannouris , 2009, 2011. -# George Vasilakos , 2011. -# +# +# Translators: +# Efstathios Iosifidis , 2014 +# ebal , 2009 +# George Vasilakos , 2011 +# Stavros Giannouris , 2009,2011 msgid "" msgstr "" -"Project-Id-Version: thunar-volman git version\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2011-01-07 18:44+0200\n" -"Last-Translator: Spiros Georgaras \n" -"Language-Team: Greek \n" -"Language: el\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-12-26 20:09+0000\n" +"Last-Translator: Efstathios Iosifidis \n" +"Language-Team: Greek (http://www.transifex.com/projects/p/thunar-volman/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Country: GREECE\n" +"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Greek\n" -"X-Poedit-SourceCharset: utf-8\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Η διαδρομή syfs της συσκευής που προστέθηκε πρόσφατα" +msgid "The sysfs path of the newly added device" +msgstr "Η διαδρομή sysfs της συσκευής που προστέθηκε πρόσφατα" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Ρύθμιση διαχείρισης των αφαιρούμενων συσκευών και μέσων" @@ -41,26 +40,24 @@ msgid "Thunar Volume Manager" msgstr "Διαχειριστής αφαιρούμενων μονάδων του Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Όλα τα δικαιώματα διατηρούνται." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Παρακαλώ αναφέρατε σφάλματα στο <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Δεν υπάρχει συσκευή με την διαδρομή sysfs \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"Πρέπει να προσδιορίσετε τη διαδρομή sysfs των νέων συσκευών με --device-" -"added" +msgstr "Πρέπει να προσδιορίσετε τη διαδρομή sysfs των νέων συσκευών με --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -107,9 +104,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Υπάρχουν εικόνες στην κάρτα. Θέλετε να προσθέσετε τις εικόνες στο άλμπουμ " -"σας;" +msgstr "Υπάρχουν εικόνες στην κάρτα. Θέλετε να προσθέσετε τις εικόνες στο άλμπουμ σας;" #. prompt the user to execute the file #. prompt the user to execute this file @@ -219,17 +214,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Άγνωστος τύπος συσκευής μπλοκ" +msgid "Unknown block device type \"%s\"" +msgstr "Άγνωστος τύπος συσκευής μπλοκ \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Ο τύπος συσκευής δεν υποστηρίζεται" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "Πληκτρολόγια" +msgid "Device type \"%s\" not supported" +msgstr "Ο τύπος συσκευής \"%s\" δεν υποστηρίζεται" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -239,11 +230,6 @@ msgid "A keyboard was detected" msgstr "Εντοπίστηκε ένα πληκτρολόγιο" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "Ταμπλέτα" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -254,10 +240,6 @@ msgid "A graphics tablet was detected" msgstr "Εντοπίστηκε μια ταμπλέτα" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "Ποντίκι" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "Εντοπίστηκε ποντίκι" @@ -268,8 +250,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Μη υποστηριζόμενη συσκευή εισόδου" +msgid "Unsupported input device type \"%s\"" +msgstr "Μη υποστηριζόμενη συσκευή εισόδου \"%s\"" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -336,15 +318,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Μη υποστιριζόμενος τύπος USB συσκευής" +msgid "Unsupported USB device type \"%s\"" +msgstr "Μη υποστιριζόμενος τύπος USB συσκευής \"%s\"" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Ρυθμίσεις διαχειριστή τόμων Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Αφαιρούμενοι οδηγοί και μέσα" @@ -377,9 +359,7 @@ msgid "Shell Scripts" msgstr "Δέσμες ενεργειών κέλυφους" -#. #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Μέσο αποθήκευσης" @@ -424,9 +404,7 @@ msgid "Command for A_udio CDs:" msgstr "Εντολή για CD ή_χου:" -#. #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Πολυμέσα" @@ -470,9 +448,7 @@ msgid "Play _music files when connected" msgstr "Αναπαραγωγή _μουσικών αρχείων όταν συνδεθούν" -#. #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Φωτογραφικές μηχανές" @@ -485,9 +461,7 @@ msgid "Import digital photographs when connected" msgstr "Εισαγωγή ψηφιακών φωτογραφιών όταν συνδεθούν " -#. #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA" @@ -508,9 +482,7 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Συγχρονισμός _συσκευών Pocket PC όταν συνδεθεί" -#. #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -520,9 +492,7 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Αυτόματη εκτέλεση προγράμματος όταν συνδεθεί ένας ε_κτυπωτής" -#. #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Συσκευές εισόδου" @@ -532,17 +502,14 @@ msgstr "Πληκτρολόγια" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "" -"Αυτόματη ε_κτέλεση ενός προγράμματος όταν συνδεθεί ένα πληκτρολόγιο USB" +msgstr "Αυτόματη ε_κτέλεση ενός προγράμματος όταν συνδεθεί ένα πληκτρολόγιο USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Ποντίκια" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" msgstr "Αυτόματη εκτέλεση ενός προγράμματος όταν συνδεθεί ένα _ποντίκι usb" @@ -561,64 +528,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Αποτυχία ανοίγματος του περιηγητή βοήθειας" - -#~ msgid "Failed to open display" -#~ msgstr "Απέτυχε να ανοίξει η οθόνη" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "" -#~ "Η ομάδα ανάπτυξης του Thunar. Με την επιφύλαξη παντός νομίμου δικαιώματος." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Γράφτηκε από τον Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Το καθορισμένο UDI \"%s\" δεν είναι έγκυρο UDI συσκευής HAL" - -#~ msgid "Encrypted volume" -#~ msgstr "Κρυπτογραφημένες μονάδες" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Προσάρτηση κρυπτογραφημένης " -#~ "μονάδας..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Ρύθμιση του επιπέδου κρυπτογράφησης..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Δεν έχετε τα δικαιώματα να ρυθμίσετε το επίπεδο κρυπτογράφησης" - -#~ msgid "Wrong password" -#~ msgstr "Λανθασμένο συνθηματικό" - -#~ msgid "Wrong password." -#~ msgstr "" -#~ "Λανθασμένο συνθηματικό." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Αυτή η μονάδα είναι κρυπτογραφημένη." -#~ "" - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Παρακαλώ εισάγετε το συνθηματικό για την αποκρυπτογράφηση και προσάρτηση " -#~ "της μονάδας." - -#~ msgid "_Mount" -#~ msgstr "_Προσάρτηση" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Αποτυχία ρύθμισης της κρυπτογραφημένης μονάδας" - -#~ msgid "Choose Disc Type" -#~ msgstr "Επιλογή τύπου δίσκου" - -#~ msgid "Make _DVD" -#~ msgstr "Δημιουργία _dvd" - -#~ msgid "Removable Media" -#~ msgstr "Αφαιρούμενα μέσα" diff -Nru thunar-volman-0.6.1/po/en_AU.po thunar-volman-0.8.1/po/en_AU.po --- thunar-volman-0.6.1/po/en_AU.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/en_AU.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,533 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# k3lt01 , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-22 05:24+0000\n" +"Last-Translator: k3lt01 \n" +"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfce/language/en_AU/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_AU\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "The sysfs path of the newly added device" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "Configure management of removable drives and media" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "Print version information and exit" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "Thunar Volume Manager" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "All rights reserved." + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Please report bugs to <%s>." + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "There is no device with the sysfs path \"%s\"" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "Must specify the sysfs path of new devices with --device-added" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "Photos and Music" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "Photos were found on your portable music player" + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "Would you like to import the photos or manage the music?" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "Ig_nore" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "Import _Photos" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "Manage _Music" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "Photo Import" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "A photo card has been detected" + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "There are photos on the card. Would you like to add these photos to your album?" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "Would you like to allow \"%s\" to run?" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "Auto-Run Confirmation" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "Auto-Run capability detected" + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "_Allow Auto-Run" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "Would you like to open \"%s\"?" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "Auto-Open Confirmation" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "Auto-Open capability detected" + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "_Open" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "CD mounted" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "DVD mounted" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "The CD was mounted automatically" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "The DVD was mounted automatically" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "Volume mounted" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "The volume \"%s\" was mounted automatically" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "The inserted volume was mounted automatically" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "Unable to locate mount point" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "Unable to mount the device" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "Could not detect the volume corresponding to the device" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "Audio/Data CD" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "The CD in the drive contains both music and files" + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "Would you like to listen to music or browse the files?" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "_Browse Files" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "_Play CD" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "Unknown block device type \"%s\"" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "Device type \"%s\" not supported" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "Keyboard detected" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "A keyboard was detected" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "Tablet detected" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "A graphics tablet was detected" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "Mouse detected" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "A mouse was detected" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "Unsupported input device type \"%s\"" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "Autoburning of blank CDs and DVDs is disabled" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "Blank DVD inserted" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "You have inserted a blank DVD." + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "What would you like to do?" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "Burn _DVD" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "Blank CD inserted" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "You have inserted a blank CD." + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "Burn _Data CD" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "Burn _Audio CD" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "The burn command may not be empty" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "The CD player command is undefined" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "Camera detected" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "A photo camera was detected" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "Printer detected" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "A USB printer was detected" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "Unsupported USB device type \"%s\"" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "Thunar Volume Manager Settings" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "Removable Drives and Media" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "Select an Application" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "All Files" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "Executable Files" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "Perl Scripts" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "Python Scripts" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "Ruby Scripts" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "Shell Scripts" + +#. Storage +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "Storage" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "Removable Storage" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "_Mount removable drives when hot-plugged" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "Mount removable media when _inserted" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "B_rowse removable media when inserted" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "_Auto-run programs on new drives and media" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "Auto-open files on new drives and media" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "Blank CDs and DVDs" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "_Burn a CD or DVD when a blank disc is inserted" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "Command for _Data CDs:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "Command for A_udio CDs:" + +#. Multimedia +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "Multimedia" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "Audio CDs" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "Play _audio CDs when inserted" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "_Command:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "Video CDs/DVDs" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "Play _video CDs and DVDs when inserted" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "C_ommand:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "Portable Music Players" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "Play _music files when connected" + +#. Cameras +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "Cameras" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "Digital Cameras" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "Import digital photographs when connected" + +#. PDAs +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "PDAs" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "Sync _Palm™ devices when connected" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "Pocket PCs" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "Sync Pocket P_C devices when connected" + +#. Printers +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "Printers" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "Automatically run a program when a _printer is connected" + +#. Input Devices +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "Input Devices" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "Keyboards" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "Automatically run a program when a USB _keyboard is connected" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "Mice" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Automatically run a program when a USB _mouse is connected" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "Tablet" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "Automatically run a program when a _tablet is connected" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "Com_mand:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "Failed to open the documentation browser" diff -Nru thunar-volman-0.6.1/po/en_GB.po thunar-volman-0.8.1/po/en_GB.po --- thunar-volman-0.6.1/po/en_GB.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/en_GB.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,29 +1,30 @@ -# English/GB translation of thunar-volman. -# Copyright (C) 2007 THE thunar-volman'S COPYRIGHT HOLDER -# This file is distributed under the same license as the thunar-volman package. -# Jeff Bailes , 2007. -# -# -#, fuzzy +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Noskcaj , 2013 +# Jeff Bailes , 2007 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2009-08-18 11:54+1000\n" -"Last-Translator: Jeff Bailes \n" -"Language-Team: English/GB\n" -"Language: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/xfce/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Configure management of removable drives and media" @@ -37,21 +38,21 @@ msgid "Thunar Volume Manager" msgstr "Thunar Volume Manager" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "All rights reserved." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Please report bugs to <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "There is no device with the sysfs path \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Must specify the sysfs path of new devices with --device-added" @@ -101,9 +102,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"There are photos on the card. Would you like to add these photos to your " -"album?" +msgstr "There are photos on the card. Would you like to add these photos to your album?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -213,17 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Unknown block device type" +msgid "Unknown block device type \"%s\"" +msgstr "Unknown block device type \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Device type not supported" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "input-keyboard" +msgid "Device type \"%s\" not supported" +msgstr "Device type \"%s\" not supported" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -233,11 +228,6 @@ msgid "A keyboard was detected" msgstr "A keyboard was detected" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "input-tablet" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -248,10 +238,6 @@ msgid "A graphics tablet was detected" msgstr "A graphics tablet was detected" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "input-mouse" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "Mouse detected" @@ -262,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Unsupported input device type" +msgid "Unsupported input device type \"%s\"" +msgstr "Unsupported input device type \"%s\"" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -330,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Unsupported USB device type" +msgid "Unsupported USB device type \"%s\"" +msgstr "Unsupported USB device type \"%s\"" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunar Volume Manager Settings" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Removable Drives and Media" @@ -371,9 +357,8 @@ msgid "Shell Scripts" msgstr "Shell Scripts" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Storage" @@ -418,9 +403,8 @@ msgid "Command for A_udio CDs:" msgstr "Command for A_udio CDs:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" @@ -464,9 +448,8 @@ msgid "Play _music files when connected" msgstr "Play _music files when connected" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Cameras" @@ -479,9 +462,8 @@ msgid "Import digital photographs when connected" msgstr "Import digital photographs when connected" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -502,9 +484,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Sync Pocket P_C devices when connected" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -514,9 +495,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Automatically run a program when a _printer is connected" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Input Devices" @@ -526,18 +506,16 @@ msgstr "Keyboards" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "Automatically run a program when an USB _keyboard is connected" +msgstr "Automatically run a program when a USB _keyboard is connected" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Mice" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" -msgstr "Automatically run a program when an USB _mouse is connected" +msgstr "Automatically run a program when a USB _mouse is connected" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -554,58 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Failed to open the documentation browser" - -#~ msgid "Failed to open display" -#~ msgstr "Failed to open display" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "The Thunar development team. All rights reserved." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Written by Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "The specified UDI \"%s\" is not a valid HAL device UDI" - -#~ msgid "Encrypted volume" -#~ msgstr "Encrypted volume" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Mounting encrypted volume..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Setting up the crypto layer..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "You are not privileged to setup the crypto layer" - -#~ msgid "Wrong password" -#~ msgstr "Wrong password" - -#~ msgid "Wrong password." -#~ msgstr "Wrong password." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "This volume is encrypted." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Please enter your password to decrypt and mount the volume." - -#~ msgid "_Mount" -#~ msgstr "_Mount" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Failed to setup the encrypted volume" - -#~ msgid "Choose Disc Type" -#~ msgstr "Choose Disc Type" - -#~ msgid "Make _DVD" -#~ msgstr "Make _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Removable Media" diff -Nru thunar-volman-0.6.1/po/es.po thunar-volman-0.8.1/po/es.po --- thunar-volman-0.6.1/po/es.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/es.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,60 +1,63 @@ -# Spanish translation of the thunar-volman package. -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # -# Abel Martín , 2008, 2011. +# Translators: +# Abel Martín , 2008,2011 +# Adolfo Jayme Barrientos, 2014 +# Adolfo Jayme Barrientos, 2014 +# Pablo Roberto Francisco Lezaeta Reyes , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-24 16:48+0000\n" -"PO-Revision-Date: 2011-03-10 20:07-0300\n" -"Last-Translator: \n" -"Language-Team: Spanish \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2015-02-21 20:02+0000\n" +"Last-Translator: Manolo Díaz \n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/thunar-volman/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.2\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "El UDI de dispositivo HAL del nuevo dispositivo añadido" +msgid "The sysfs path of the newly added device" +msgstr "La ruta sysfs para el nuevo dispositivo creado" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Configurar la gestión de dispositivos y soportes extraíbles" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "Mostrar la información de versión y salir" +msgstr "Muestra la información de versión y sale" #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Gestor de volúmenes de Thunar" +msgstr "Administrador de volúmenes de Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Todos los derechos reservados." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, informe de fallos a <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "No existe el dispositivo con el UDI \"%s\"" +msgstr "No existe el dispositivo con la ruta de sysfs «%s»" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "Debe especificar el nuevo UDI de dispositivo HAL con --device-added" +msgstr "Debe especificar la ruta sysfs del nuevo dispositivo con --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -67,7 +70,7 @@ #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" -msgstr "¿Desea importar las fotos o gestionar la música?" +msgstr "¿Quiere importar las fotos o gestionar la música?" #: ../thunar-volman/tvm-block-device.c:208 #: ../thunar-volman/tvm-block-device.c:277 @@ -95,7 +98,7 @@ #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" -msgstr "Una tarjeta con fotos ha sido detectada" +msgstr "Se ha detectado una tarjeta con fotos" #: ../thunar-volman/tvm-block-device.c:275 msgid "" @@ -109,36 +112,36 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "¿Desea permitir que se ejecute \"%s\"?" +msgstr "¿Desea permitir que se ejecute «%s»?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 msgid "Auto-Run Confirmation" -msgstr "Confirmación de auto-ejecución" +msgstr "Confirmación de autoejecución" #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid "Auto-Run capability detected" -msgstr "Capacidad de auto-ejecución detectada" +msgstr "Capacidad de autoejecución detectada" #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 msgid "_Allow Auto-Run" -msgstr "Permitir la _auto-ejecución" +msgstr "Permitir la _autoejecución" #. prompt the user whether to autoopen this file #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "¿Desea abrir \"%s\"?" +msgstr "¿Quiere abrir «%s»?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" -msgstr "Confirmación de auto-apertura" +msgstr "Confirmación de autoapertura" #: ../thunar-volman/tvm-block-device.c:506 msgid "Auto-Open capability detected" -msgstr "Capacidad de auto-apertura detectada" +msgstr "Capacidad de autoapertura detectada" #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" @@ -167,17 +170,17 @@ #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "El volumen \"%s\" ha sido montado automáticamente" +msgstr "El volumen «%s» se montó automáticamente" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "El volumen insertado ha sido montado automáticamente" +msgstr "El volumen insertado se montó automáticamente" #: ../thunar-volman/tvm-block-device.c:694 #, c-format msgid "Unable to locate mount point" -msgstr "Incapaz de encontrar el punto de montaje" +msgstr "No se pudo encontrar el punto de montaje" #: ../thunar-volman/tvm-block-device.c:740 #, c-format @@ -191,15 +194,15 @@ #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "CD de audio / datos" +msgstr "CD de audio/datos" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" -msgstr "El CD dentro del dispositivo contiene música y archivos." +msgstr "El CD insertado en la unidad contiene música y datos" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "¿Desea escuchar música o ver los archivos?" +msgstr "¿Quiere escuchar la música o ver los archivos?" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" @@ -211,13 +214,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Tipo de dispositivo por bloque desconocido" +msgid "Unknown block device type \"%s\"" +msgstr "Dispositivo por tipo de bloque «%s» desconocido" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Dispositivo no soportado" +msgid "Device type \"%s\" not supported" +msgstr "No se admite el tipo de dispositivo «%s»" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -225,17 +228,17 @@ #: ../thunar-volman/tvm-input-device.c:76 msgid "A keyboard was detected" -msgstr "Un teclado ha sido detectado" +msgstr "Se detectó un teclado" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" -msgstr "Pantalla táctil detectada." +msgstr "Tableta detectada" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "Una pantalla táctil ha sido detectada." +msgstr "Se detectó una tableta gráfica" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" @@ -243,17 +246,17 @@ #: ../thunar-volman/tvm-input-device.c:112 msgid "A mouse was detected" -msgstr "Un ratón ha sido detectado" +msgstr "Se detectó un ratón" #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Dispositivo de entrada no soportado" +msgid "Unsupported input device type \"%s\"" +msgstr "No se admite el tipo de dispositivo de entrada «%s»" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "La auto-grabación de CDs y DVDs vírgenes está deshabilitada." +msgstr "La grabación automática de CD y DVD vírgenes está desactivada" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" @@ -265,11 +268,11 @@ #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" -msgstr "¿Qué desea hacer?" +msgstr "¿Qué quiere hacer?" #: ../thunar-volman/tvm-run.c:193 msgid "Burn _DVD" -msgstr "Crear _DVD" +msgstr "Grabar _DVD" #: ../thunar-volman/tvm-run.c:200 msgid "Blank CD inserted" @@ -281,21 +284,21 @@ #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" -msgstr "Crear un CD de _datos" +msgstr "Grabar CD de _datos" #: ../thunar-volman/tvm-run.c:205 msgid "Burn _Audio CD" -msgstr "Crear un CD _audio" +msgstr "Grabar CD de _audio" #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "La acción asociada a la grabación de CDs y DVDs debería estar definida" +msgstr "La acción asociada a la grabación de CD y DVD debería estar definida" #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "No hay ninguna acción asociada a la reproducción de CDs de audio" +msgstr "No hay ninguna acción asociada a la reproducción de CD de audio" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" @@ -303,7 +306,7 @@ #: ../thunar-volman/tvm-usb-device.c:63 msgid "A photo camera was detected" -msgstr "Una camara digital ha sido detectada" +msgstr "Se detectó una cámara digital" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" @@ -311,19 +314,19 @@ #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "Una Impresora (USB) ha sido detectada " +msgstr "Se detectó una impresora conectada por USB" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Dispositivo USB no soportado" +msgid "Unsupported USB device type \"%s\"" +msgstr "No se admite el tipo de dispositivo USB «%s»" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Configuraciones del Gestor de Volúmenes de Thunar" +msgstr "Configuración del Administrador de volúmenes de Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Dispositivos y soportes extraíbles" @@ -342,22 +345,21 @@ #: ../thunar-volman-settings/tvm-command-entry.c:270 msgid "Perl Scripts" -msgstr "Scripts de Perl" +msgstr "Intérprete de órdenes en Perl" #: ../thunar-volman-settings/tvm-command-entry.c:276 msgid "Python Scripts" -msgstr "Scripts de Python" +msgstr "Intérprete de órdenes en Python" #: ../thunar-volman-settings/tvm-command-entry.c:282 msgid "Ruby Scripts" -msgstr "Scripts de Ruby" +msgstr "Intérprete de órdenes en Ruby" #: ../thunar-volman-settings/tvm-command-entry.c:288 msgid "Shell Scripts" -msgstr "Scripts de shell" +msgstr "Intérprete de órdenes" #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Almacenamiento" @@ -372,23 +374,23 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:166 msgid "Mount removable media when _inserted" -msgstr "Montar soportes extraíbles al ser _insertados" +msgstr "Montar soportes extraíbles al _insertarlos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:174 msgid "B_rowse removable media when inserted" -msgstr "E_xaminar soporte extraíble al ser insertado" +msgstr "E_xaminar soportes extraíbles al insertarlos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" -msgstr "_Auto-ejecución de programas en nuevos soportes y unidades" +msgstr "_Autoejecución de programas en nuevos soportes y unidades" #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" -msgstr "Auto-apertura de archivos en nuevos soportes y unidades" +msgstr "Autoapertura de archivos en nuevos soportes y unidades" #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" -msgstr "Borrar CDs y DVDs" +msgstr "Borrar CD y DVD" #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" @@ -396,25 +398,24 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" -msgstr "Comando para los CDs de _datos:" +msgstr "Orden para los CD de _datos:" #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "Comando para los CDs de a_udio:" +msgstr "Orden para los CD de a_udio:" #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" #: ../thunar-volman-settings/tvm-preferences-dialog.c:266 msgid "Audio CDs" -msgstr "CDs de audio" +msgstr "CD de audio" #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "Reproducir CDs de _audio al ser insertados" +msgstr "Reproducir CD de _audio al insertarlos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -422,33 +423,32 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:553 #: ../thunar-volman-settings/tvm-preferences-dialog.c:601 msgid "_Command:" -msgstr "_Comando:" +msgstr "_Orden:" #: ../thunar-volman-settings/tvm-preferences-dialog.c:304 msgid "Video CDs/DVDs" -msgstr "CDs/DVDs de vídeo" +msgstr "CD/DVD de vídeo" #: ../thunar-volman-settings/tvm-preferences-dialog.c:321 msgid "Play _video CDs and DVDs when inserted" -msgstr "Reproducir CDs y DVDs de _vídeo al ser insertados" +msgstr "Reproducir CD y DVD de _vídeo al insertarlos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:329 #: ../thunar-volman-settings/tvm-preferences-dialog.c:367 #: ../thunar-volman-settings/tvm-preferences-dialog.c:505 #: ../thunar-volman-settings/tvm-preferences-dialog.c:640 msgid "C_ommand:" -msgstr "C_omando:" +msgstr "O_rden:" #: ../thunar-volman-settings/tvm-preferences-dialog.c:343 msgid "Portable Music Players" -msgstr "Reproductor de música portátil" +msgstr "Reproductores de música portátiles" #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" -msgstr "Reproducir archivos de _música al ser conectado" +msgstr "Reproducir archivos de _música al conectarlos" #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Cámaras" @@ -459,13 +459,12 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "Importar fotografías digitales al ser conectada" +msgstr "Importar fotografías digitales al conectarlas" #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" -msgstr "PDAs" +msgstr "PDA" #: ../thunar-volman-settings/tvm-preferences-dialog.c:441 msgid "Palm™" @@ -473,18 +472,17 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:458 msgid "Sync _Palm™ devices when connected" -msgstr "Sincronizar dispositivos _Palm™ al ser conectados" +msgstr "Sincronizar dispositivos _Palm™ al conectarlos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" -msgstr "Pocket PCs" +msgstr "Pocket PC" #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" -msgstr "Sincronizar dispositivos Pocket P_C al ser conectados" +msgstr "Sincronizar dispositivos Pocket P_C al conectarlos" #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -495,7 +493,6 @@ msgstr "Ejecutar automáticamente un programa al conectar una im_presora" #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Dispositivos de entrada" @@ -518,82 +515,16 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" -msgstr "Tableta gráfica" +msgstr "Tableta" #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "" -"Ejecutar automáticamente un programa cuando se conecta una _tableta gráfica" +msgstr "Ejecutar automáticamente un programa al conectar una _tableta" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" -msgstr "Co_mando:" +msgstr "Or_den:" #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" -msgstr "Fallo al abrir el visor de documentación" - -#~ msgid "input-keyboard" -#~ msgstr "input-keyboard" - -#~ msgid "input-tablet" -#~ msgstr "input-tablet" - -#~ msgid "input-mouse" -#~ msgstr "input-mouse" - -#~ msgid "Failed to open display" -#~ msgstr "Fallo al abrir display" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "El equipo de desarrollo de Thunar. Todos los derechos reservados." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Escrito por Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "El UDI \"%s\" especificado no es un UDI de dispositivo HAL válido." - -#~ msgid "Encrypted volume" -#~ msgstr "Volumen cifrado" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Montando volumen cifrado..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Configurando la capa de cifrado..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "No tiene privilegios para configurar la capa de cifrado" - -#~ msgid "Wrong password" -#~ msgstr "Contraseña incorrecta" - -#~ msgid "Wrong password." -#~ msgstr "Contraseña incorrecta." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Este volumen está cifrado." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Por favor, introduzca su contraseña para descifrar y montar el volumen." - -#~ msgid "_Mount" -#~ msgstr "_Montar" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Fallo al configurar el volumen cifrado" - -#~ msgid "Choose Disc Type" -#~ msgstr "Elegir el tipo de disco" - -#~ msgid "Make _DVD" -#~ msgstr "Crear un _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Soportes extraíbles" +msgstr "No se pudo abrir el visor de documentación" diff -Nru thunar-volman-0.6.1/po/eu.po thunar-volman-0.8.1/po/eu.po --- thunar-volman-0.6.1/po/eu.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/eu.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,30 +1,29 @@ -# translation of eu.po to Euskara -# thunar-volman basque translation +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Piarres Beobide , 2007, 2008. +# Translators: +# Piarres Beobide , 2007-2008 msgid "" msgstr "" -"Project-Id-Version: eu\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-16 08:45+0000\n" -"PO-Revision-Date: 2008-11-09 15:38+0200\n" -"Last-Translator: Piarres Beobide \n" -"Language-Team: Euskara \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Basque (http://www.transifex.com/projects/p/xfce/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 1.2.0\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Gehitu berri den gailuaren sysfs bidea" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Konfiguratu gailu eta euskarri aldagarrien kudeaketa" @@ -38,21 +37,21 @@ msgid "Thunar Volume Manager" msgstr "Thunar Bolumen Kudeatzailea" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Eskubide guztiak erreserbaturik." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Programa erroreen berri eman hemen : <%s>" -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Ez dago \"%s\" sysfs bidea duen gailurik" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Gailu berrien sysfs-a --device-added erabiliaz ezarri behar da" @@ -102,8 +101,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Argazkiak daude txartelean. Argazki horiek zure albumean gehitu nahi dituzu?" +msgstr "Argazkiak daude txartelean. Argazki horiek zure albumean gehitu nahi dituzu?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -213,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Bloke gailu mota ezezaguna" +msgid "Unknown block device type \"%s\"" +msgstr "\"%s\" bloke gailu mota ezezaguna" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Gailu mota ez da onartzen" +msgid "Device type \"%s\" not supported" +msgstr "\"%s\" gailu mota ez da onartzen" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -249,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Onartzen ez den sarrera gailu mota" +msgid "Unsupported input device type \"%s\"" +msgstr "\"%s\" motako onartzen ez den sarrera gailua " #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -317,15 +315,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Onartzen ez de USB gailu mota" +msgid "Unsupported USB device type \"%s\"" +msgstr "\"%s\" motako onartzen ez de USB gailu " #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunar bolumen kudeatzaile ezarpenak" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Gailu eta Euskarri Aldagarriak" @@ -533,69 +531,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Huts dokumentazio nabigatzailea irekitzean" - -#~ msgid "input-keyboard" -#~ msgstr "sarrera-teklatua" - -#~ msgid "input-tablet" -#~ msgstr "sarrera-tableta" - -#~ msgid "input-mouse" -#~ msgstr "sarrera-sagua" - -#~ msgid "Failed to open display" -#~ msgstr "Huts panataila irekitzean" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Thunar garapen taldea. Eskubide guztiak erreserbaturik" - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Benedikt Meurer -ek idatzia." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Ezarritako UDI \"%s\" ez da baliozko HAL gailu UDI bat" - -#~ msgid "Encrypted volume" -#~ msgstr "Enkriptaturiko bolumena" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Enkriptaturiko bolumena muntatzen..." -#~ "" - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Kriptografia geruza konfiguratzen..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Ez duzu kriptografia geruza konfiguratzeko baimenik" - -#~ msgid "Wrong password" -#~ msgstr "Okerreko pasahitza" - -#~ msgid "Wrong password." -#~ msgstr "Okerreko pasahitza." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Bolumen hau enkriptaturik dago." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Mesedez idatzi pasahitza bolumenda desenkriptatu eta muntatzeko." - -#~ msgid "_Mount" -#~ msgstr "_Muntatu" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Huts enkriptaturiko bolumena konfiguratzean" - -#~ msgid "Choose Disc Type" -#~ msgstr "Hautatu disko mota" - -#~ msgid "Make _DVD" -#~ msgstr "DVD-a egin" - -#~ msgid "Removable Media" -#~ msgstr "Euskarri aldagarriak" diff -Nru thunar-volman-0.6.1/po/fi.po thunar-volman-0.8.1/po/fi.po --- thunar-volman-0.6.1/po/fi.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/fi.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,27 +1,30 @@ -# Finnish translations for thunar-volman. -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. -# Jari Rahkonen , 2007-2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jiri Grönroos , 2013 +# Pasi Lallinaho , 2014 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" -"PO-Revision-Date: 2011-05-29 13:09+0300\n" -"Last-Translator: Jari Rahkonen \n" -"Language-Team: Finnish \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-08-22 17:45+0000\n" +"Last-Translator: Pasi Lallinaho \n" +"Language-Team: Finnish (http://www.transifex.com/projects/p/thunar-volman/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Lisätyn laitteen sysfs-polku" +msgid "The sysfs path of the newly added device" +msgstr "Uuden lisätyn laitteen sysfs-polku" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Muokkaa irrotettavien asemien ja taltioiden hallinta-asetuksia" @@ -31,25 +34,25 @@ msgstr "Tulosta versiotiedot ja poistu" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Thunarin taltionhallinta" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Kaikki oikeudet pidätetään." -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Ilmoita vioista osoitteeseen <%s>" -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Sysfs-polku \"%s\" ei viittaa mihinkään laitteeseen." -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Määritä usien laitteiden sysfs-polut valitsimella --device-added" @@ -209,17 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Tuntematon lohkolaite" +msgid "Unknown block device type \"%s\"" +msgstr "Tyypin \"%s\" tukematon laite" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Laitetyyppiä ei tueta" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "syöttö-näppäimistö" +msgid "Device type \"%s\" not supported" +msgstr "Laitetyyppi \"%s\" ei ole tuettu" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -229,11 +228,6 @@ msgid "A keyboard was detected" msgstr "Havaittiin näppäimistö." -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "syöttö-piirtopöytä" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -244,22 +238,18 @@ msgid "A graphics tablet was detected" msgstr "Havaittiin piirtöpöytä." -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "syöttö-hiiri" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "Hiiri havaittu" #: ../thunar-volman/tvm-input-device.c:112 msgid "A mouse was detected" -msgstr "Havaittiin hiiri." +msgstr "Havaittiin hiiri" #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Syöttölaitetyyppiä ei tueta" +msgid "Unsupported input device type \"%s\"" +msgstr "Tyypin \"%s\" tukematon syöttölaite" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -326,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "USB-laitetyyppiä ei tueta" +msgid "Unsupported USB device type \"%s\"" +msgstr "Tyypin \"%s\" tukematon USB-laite" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunarin taltionhallinnan asetukset" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Irrotettavat asemat ja taltiot" @@ -367,9 +357,7 @@ msgid "Shell Scripts" msgstr "Kehotteen komentosarjat" -#. #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Tietovälineet" @@ -414,9 +402,7 @@ msgid "Command for A_udio CDs:" msgstr "Komento ää_ni-CD:ille" -#. #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" @@ -460,9 +446,7 @@ msgid "Play _music files when connected" msgstr "Soita _musiikkitiedostoja, kun laite yhdistetään" -#. #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Kamerat" @@ -475,9 +459,7 @@ msgid "Import digital photographs when connected" msgstr "Tuo digikuvia, kun laite yhdistetään" -#. #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "Kämmentietokoneet" @@ -498,9 +480,7 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Synkronoi Pocket P_C, kun laite yhdistetään" -#. #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -510,9 +490,7 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Suorita sovellus, kun _tulostin yhdistetään" -#. #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Syöttölaitteet" @@ -522,7 +500,7 @@ msgstr "Näppäimistöt" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" +msgid "Automatically run a program when a USB _keyboard is connected" msgstr "Suorita sovellus, kun USB-_näppäimistö yhdistetään" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 @@ -530,7 +508,7 @@ msgstr "Hiiret" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" +msgid "Automatically run a program when a USB _mouse is connected" msgstr "Suorita sovellus, kun USB-_hiiri yhdistetään" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 diff -Nru thunar-volman-0.6.1/po/fr.po thunar-volman-0.8.1/po/fr.po --- thunar-volman-0.6.1/po/fr.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/fr.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,60 +1,63 @@ -# French translation for the thunar-volman package. -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. -# Maximilian Schleiss , 2007-2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# jc1 , 2013 +# jc1 , 2013 +# Urien Desterres , 2014 +# Yannick Le Guen , 2014 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-03 08:48+0000\n" -"PO-Revision-Date: 2008-11-29 23:50+0100\n" -"Last-Translator: Maximilian Schleiss \n" -"Language-Team: French \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-08-21 18:45+0000\n" +"Last-Translator: Urien Desterres \n" +"Language-Team: French (http://www.transifex.com/projects/p/thunar-volman/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Le chemin syfs du périphérique nouvellement ajouté" +msgid "The sysfs path of the newly added device" +msgstr "Le chemin sysfs du périphérique nouvellement ajouté" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "Configurer la gestion de disques amovibles et de médias" +msgstr "Configurer la gestion des disques amovibles et des médias" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "Afficher la version et quitter" +msgstr "Afficher les informations sur la version et quitter" #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Gestionnaire de volume Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Tous droits réservés." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." -msgstr "Veuillez envoyer vos rapports de bogues à <%s>." +msgstr "Veuillez signaler les bogues à <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "Il n'y a pas de périphérique correspondant au chemin sysfs \"%s\"" +msgstr "Il n'y a aucun périphérique avec le chemin sysfs « %s »" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"Spécifier le chemin sysfs des nouveaux périphériques avec l'iption --device-" -"added" +msgstr "Spécifier le chemin sysfs des nouveaux périphériques avec l'option --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -82,7 +85,7 @@ #: ../thunar-volman/tvm-block-device.c:209 #: ../thunar-volman/tvm-block-device.c:278 msgid "Import _Photos" -msgstr "Importer les _Photos" +msgstr "Importer les _photos" #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" @@ -95,14 +98,13 @@ #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" -msgstr "Une carte mémoire a été détectée." +msgstr "Une carte mémoire a été détectée" #: ../thunar-volman/tvm-block-device.c:275 msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Des photos se trouvent sur la carte. Voulez-vous les ajouter à votre album ?" +msgstr "Des photos se trouvent sur la carte. Voulez-vous les ajouter à votre album ?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -110,7 +112,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "Permettez-vous l'exécution de \"%s\" ?" +msgstr "Autorisez-vous l'exécution de « %s » ?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -125,13 +127,13 @@ #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 msgid "_Allow Auto-Run" -msgstr "_Permettre l'auto-exécution" +msgstr "_Autoriser l'auto-exécution" #. prompt the user whether to autoopen this file #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "Voulez-vous ouvrir \"%s\" ?" +msgstr "Voulez-vous ouvrir « %s » ?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" @@ -168,7 +170,7 @@ #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "Le volume \"%s\" a été monté automatiquement" +msgstr "Le volume « %s » a été monté automatiquement" #: ../thunar-volman/tvm-block-device.c:640 #, c-format @@ -188,11 +190,11 @@ #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "Ne peux pas détecter le volume correspondant au périphérique" +msgstr "Impossible de détecter le volume correspondant au périphérique" #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "Audio/Data CD" +msgstr "CD Audio/Données" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" @@ -200,11 +202,11 @@ #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "Voulez-vous écouter la musique ou lire les données ?" +msgstr "Voulez-vous écouter la musique ou parcourir les fichiers ?" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" -msgstr "_Lire les données" +msgstr "_Parcourir les fichiers" #: ../thunar-volman/tvm-block-device.c:831 msgid "_Play CD" @@ -212,13 +214,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Type de périphérique bloc inconnu" +msgid "Unknown block device type \"%s\"" +msgstr "Type de périphérique bloc inconnu « %s »" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Type de périphérique non supporté" +msgid "Device type \"%s\" not supported" +msgstr "Type de périphérique « %s » non pris en charge" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -248,13 +250,13 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Périphérique d'entrée non supporté" +msgid "Unsupported input device type \"%s\"" +msgstr "Périphérique d'entrée de type « %s » non pris en charge" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "La gravure automatique des CDs et DVDs vierges a été désactivée" +msgstr "La gravure automatique des CD et DVD vierges a été désactivée" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" @@ -262,7 +264,7 @@ #: ../thunar-volman/tvm-run.c:190 msgid "You have inserted a blank DVD." -msgstr "Vous avez inséré un disque vierge." +msgstr "Vous avez inséré un DVD vierge." #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -278,11 +280,11 @@ #: ../thunar-volman/tvm-run.c:201 msgid "You have inserted a blank CD." -msgstr "Vous avez inséré un disque vierge." +msgstr "Vous avez inséré un CD vierge." #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" -msgstr "Créer un CD de données" +msgstr "Créer un CD de _données" #: ../thunar-volman/tvm-run.c:205 msgid "Burn _Audio CD" @@ -291,7 +293,7 @@ #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "La commande de gravure pourrait ne pas être vide" +msgstr "La commande de gravure ne peut pas être vide" #: ../thunar-volman/tvm-run.c:268 #, c-format @@ -312,19 +314,19 @@ #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "Une imprimante USB a été détecté" +msgstr "Une imprimante USB a été détectée" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Type de périphérique USB non supporté" +msgid "Unsupported USB device type \"%s\"" +msgstr "Périphérique USB de type « %s » non pris en charge" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Propriétés du Gestionnaire de Volumes Thunar" +msgstr "Propriétés du gestionnaire de volumes Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Disques amovibles et médias" @@ -343,22 +345,21 @@ #: ../thunar-volman-settings/tvm-command-entry.c:270 msgid "Perl Scripts" -msgstr "Scripts perl" +msgstr "Scripts Perl" #: ../thunar-volman-settings/tvm-command-entry.c:276 msgid "Python Scripts" -msgstr "Scripts python" +msgstr "Scripts Python" #: ../thunar-volman-settings/tvm-command-entry.c:282 msgid "Ruby Scripts" -msgstr "Scripts ruby" +msgstr "Scripts Ruby" #: ../thunar-volman-settings/tvm-command-entry.c:288 msgid "Shell Scripts" -msgstr "Scripts shell" +msgstr "Scripts Shell" #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Stockage" @@ -389,7 +390,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" -msgstr "CDs et DVDs vierges" +msgstr "CD et DVD vierges" #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" @@ -397,25 +398,24 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" -msgstr "Commande pour les CDs _données :" +msgstr "Commande pour les CD de _données :" #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "Commande pour les CDs A_udio :" +msgstr "Commande pour les CD A_udio :" #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimédia" #: ../thunar-volman-settings/tvm-preferences-dialog.c:266 msgid "Audio CDs" -msgstr "CDs audio" +msgstr "CD audio" #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "Écouter les CDs _audio à l'insertion" +msgstr "Écouter les CD _audio à l'insertion" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -427,11 +427,11 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:304 msgid "Video CDs/DVDs" -msgstr "CDs/DVDs vidéo" +msgstr "CD/DVD vidéo" #: ../thunar-volman-settings/tvm-preferences-dialog.c:321 msgid "Play _video CDs and DVDs when inserted" -msgstr "Visionner les CDs et DVDs vidéo à l'insertion" +msgstr "Visionner les CD et DVD vidéo à l'insertion" #: ../thunar-volman-settings/tvm-preferences-dialog.c:329 #: ../thunar-volman-settings/tvm-preferences-dialog.c:367 @@ -449,24 +449,22 @@ msgstr "Écouter la _musique à la connexion" #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" -msgstr "Caméras" +msgstr "Appareils photos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:390 msgid "Digital Cameras" -msgstr "Caméras digitales" +msgstr "Appareils photos numériques" #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" msgstr "Importer les photos numériques à la connexion" #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" -msgstr "PDAs" +msgstr "PDA" #: ../thunar-volman-settings/tvm-preferences-dialog.c:441 msgid "Palm™" @@ -478,14 +476,13 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" -msgstr "Pocket PCs" +msgstr "Pocket PC" #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" msgstr "Synchroniser les périphériques Pocket PC une fois connectés" #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -493,23 +490,20 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "Exécuter une application à la connexion d'une imprimante" +msgstr "Exécuter une application à la connexion d'une _imprimante" #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Périphériques d'entrée" #: ../thunar-volman-settings/tvm-preferences-dialog.c:576 msgid "Keyboards" -msgstr "Clavier" +msgstr "Claviers" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "" -"Exécuter automatiquement une application lors de la connexion d'un _clavier " -"USB" +msgstr "Exécuter automatiquement une application lors de la connexion d'un _clavier USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" @@ -517,9 +511,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 msgid "Automatically run a program when a USB _mouse is connected" -msgstr "" -"Exécuter automatiquement une application lors de la connexion d'une _souris " -"USB" +msgstr "Exécuter automatiquement une application lors de la connexion d'une _souris USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -535,71 +527,4 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" -msgstr "Échec à l'ouverture du navigateur de documents" - -#~ msgid "input-keyboard" -#~ msgstr "Clavier" - -#~ msgid "input-tablet" -#~ msgstr "Tablette" - -#~ msgid "input-mouse" -#~ msgstr "Souris" - -#~ msgid "Failed to open display" -#~ msgstr "Échec à l'ouverture de l'affichage" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "L'équipe de développement de Thunar. Tous droits réservés." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Écrit par Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "l'UDI \"%s\" spécifié n'est pas un UDI de périphérique HAL valide" - -#~ msgid "Encrypted volume" -#~ msgstr "Volume crypté" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Monage du volume crypté..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Mise en place de la couche de cryptage..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "" -#~ "Vous n'avez pas les droits nécessaires à la mise en place de la couche de " -#~ "cryptage" - -#~ msgid "Wrong password" -#~ msgstr "Mot de passe incorrect" - -#~ msgid "Wrong password." -#~ msgstr "" -#~ "Mot de passe incorrect." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "Ce volume est crypté." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Veuillez saisir votre mot de passe afin de décrypter et monter le volume." - -#~ msgid "_Mount" -#~ msgstr "_Monter" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Échec à la mise en place du volume crypté" - -#~ msgid "Choose Disc Type" -#~ msgstr "Choisir le type de disque" - -#~ msgid "Make _DVD" -#~ msgstr "Créer un _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Disque amovible" +msgstr "Impossible d'ouvrir le navigateur de documentation" diff -Nru thunar-volman-0.6.1/po/gl.po thunar-volman-0.8.1/po/gl.po --- thunar-volman-0.6.1/po/gl.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/gl.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,33 +1,30 @@ -# Galician translation of thunar-volman -# Copyright (C) 2008-2009 Leandro Regueiro -# This file is distributed under the same license as the Xfce package. -# -# Leandro Regueiro , 2008, 2009. -# -# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas -# colaborar connosco, podes atopar máis información en +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Leandro Regueiro , 2008-2009 +# Leandro Regueiro , 2013 msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" -"PO-Revision-Date: 2009-08-19 13:15+0100\n" -"Last-Translator: Leandro Regueiro \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Galician (http://www.transifex.com/projects/p/xfce/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -# UDI=Uniform Driver Interface #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "A ruta sysfs do novo dispositivo engadido" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Configurar a xestión da unidades e dispositivos extraíbles" @@ -37,25 +34,25 @@ msgstr "Mostra a información da versión e sae" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Xestor de volumes de Thunar" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Todos os dereitos reservados." -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor comuníquelle os erros a <%s>." -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Non hai ningún dispositivo con ruta sysfs \"%s\"" -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Debe especificar a ruta sysfs dos novos dispositivos con --device-added" @@ -102,7 +99,9 @@ msgstr "Detectouse unha tarxeta de fotos" #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" msgstr "Hai fotos na tarxeta. Desexa engadir estas fotos ó seu álbum?" #. prompt the user to execute the file @@ -213,17 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Tipo de dispositivo de bloques descoñecido" +msgid "Unknown block device type \"%s\"" +msgstr "Tipo de dispositivo de bloques «%s» descoñecido" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Tipo de dispositivo non admitido" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "" +msgid "Device type \"%s\" not supported" +msgstr "O tipo de dispositivo «%s» non é compatíbel" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -233,11 +228,6 @@ msgid "A keyboard was detected" msgstr "Detectouse un teclado" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -248,10 +238,6 @@ msgid "A graphics tablet was detected" msgstr "Detectouse unha tableta gráfica" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "Rato detectado" @@ -262,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Tipo de dispositivo de entrada non admitido" +msgid "Unsupported input device type \"%s\"" +msgstr "Tipo de dispositivo de entrada «%s» non compatíbel" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -330,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Tipo de dispositivo USB non compatible" +msgid "Unsupported USB device type \"%s\"" +msgstr "Tipo de dispositivo USB «%s» non compatíbel" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Configuración do xestor de volumes de Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Unidades e dispositivos extraíbles" @@ -520,7 +506,7 @@ msgstr "Teclados" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" +msgid "Automatically run a program when a USB _keyboard is connected" msgstr "Executar un programa automaticamente cando se conecta un _teclado USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 @@ -528,7 +514,7 @@ msgstr "Ratos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" +msgid "Automatically run a program when a USB _mouse is connected" msgstr "Executar un programa automaticamente cando se conecta un _rato USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 @@ -546,54 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Produciuse un erro ó abrir o visor da documentación" - -#~ msgid "Failed to open display" -#~ msgstr "Fallo ao abrir visualización" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "O equipo de desenvolvemento de Thunar. Tódolos dereitos reservados." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Escrito por Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "A UDI \"%s\" especificado non é unha UDI de dispositivo HAL válido" - -#~ msgid "Encrypted volume" -#~ msgstr "Volume cifrado" - -#~ msgid "Mounting encrypted volume..." -#~ msgstr "Montando un volume cifrado..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Configurando a capa de criptografía..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Non tes privilexios para configurar a capa de criptografía" - -#~ msgid "Wrong password" -#~ msgstr "Contrasinal incorrecto" - -#~ msgid "Wrong password." -#~ msgstr "Contrasinal incorrecto." - -#~ msgid "This volume is encrypted." -#~ msgstr "Este volume está cifrado." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Introduza o seu contrasinal para descifrar e montar o volume." - -#~ msgid "_Mount" -#~ msgstr "_Montar" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Produciuse un erro ó configurar o volume cifrado" - -#~ msgid "Choose Disc Type" -#~ msgstr "Escolla o tipo de disco" - -#~ msgid "Make _DVD" -#~ msgstr "Crear _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Soportes extraíbles" diff -Nru thunar-volman-0.6.1/po/he.po thunar-volman-0.8.1/po/he.po --- thunar-volman-0.6.1/po/he.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/he.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,529 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# koby vurgaft , 2012 +# Yaron Shahrabani , 2012-2013 +# Yaron Shahrabani , 2012 +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2015-02-26 11:12+0000\n" +"Last-Translator: GenghisKhan \n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/thunar-volman/language/he/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "The sysfs path of the newly added device" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "הגדר ניהול של כוננים ומדיה נשלפים" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "Print version information and exit" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "מנהל כרכים Thunar" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "All rights reserved." + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Please report bugs to <%s>." + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "There is no device with the sysfs path \"%s\"" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "Must specify the sysfs path of new devices with --device-added" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "תצלומים ומוזיקה" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "נמצאו תצלומים על נגן מוזיקה נייד" + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "האם ברצונך לייבא את התצלומים או לנהל את המוזיקה?" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "הת_עלo" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "י_בוא תמונות" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "_נהל מוזיקה" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "יבוא תצלום" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "כרטיס תצלום אותר" + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "ישנם תצלומים על הכרטיס. האם ברצונך להוסיף את אלה לאלבום שלך?" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "האם ברצונך לאפשר להריץ את \"%s\"" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "אישור הרצה אוטומטית" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "יכולת הרצה אוטומטית אותרה" + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "_אפשר הרצה אוטומטית" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "האם ברצונך לפתוח את \"%s\"?" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "אישור פתיחה אוטומטית" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "יכולת פתיחה אוטומטית אותרה" + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "_פתח" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "תקליטור מעוגן" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "‏DVD מעוגן" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "התקליטור עוגן אוטומטית" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "ה־DVD עוגן אוטומטית" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "כרך עוגן" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "הכרך \"%s\" עוגן אוטומטית" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "הכרך שהוכנס עוגן אוטומטית" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "לא ניתן לאתר נקודת עיגון" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "לא ניתן לעגן את ההתקן" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "לא ניתן לאתר את הכרך התואם את ההתקן" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "תקליטור שמע/נתונים" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "התקליטור שבכונן מכיל גם מוזיקה וגם קבצים" + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "האם ברצונך להאזין למוזיקה או לעיין בקבצים?" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "_עיין בקבצים" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "_נגן תקליטור" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "טיפוס התקן בלוק \"%s\" לא מוכר" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "טיפוס התקן \"%s\" לא נתמך" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "מקלדת אותרה" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "אותרה מקלדת אותרה" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "טאבלט אותר" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "אותר מחשב לוח גרפי" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "עכבר אותר" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "אותר עכבר" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "טיפוס התקן קלט \"%s\" לא נתמך" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "צריבה אוטומטית של תקליטורי CD/DVD מנוטרלת" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "הוכנס ‏DVD ריק" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "הכנסת DVD ריק." + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "מה ברצונך לעשות?" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "צרוב _DVD" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "הוכנס תקליטור ריק" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "הכנסת תקליטור ריק." + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "צרוב תקליטור _מידע" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "צרוב תקליטור _שמע" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "פקודת צריבה לא אמורה להישאר ריקה" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "פקודת נגן התקליטורים אינה מוגדרת" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "מצלמה אותרה" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "אותרה מצלמת תצלומים" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "מדפסת אותרה" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "אותרה מדפסת USB" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "טיפוס התקן USB ‏\"%s\" לא נתמך" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "הגדרות מנהל כרכים Thunar" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "כוננים ומדיה נשלפים" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "בחירת יישום" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "כל הקבצים" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "קבצי הרצה" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "תסריטי Perl" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "תסריטי Python" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "תסריטי Ruby" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "תסריטי Shell" + +#. Storage +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "אחסון" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "התקני אחסון נשלפים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "_עגן כוננים נשלפים בעת חיבור" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "עגן מדיה נשלפת כאשר מו_כנסת" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "_עיין במדיה נשלפת כאשר מוכנסת" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "_הרץ אוטומטית תוכניות שעל כוננים ומדיה חדשים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "_פתח אוטומטית קבצים שעל כוננים ומדיה חדשים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "תקליטורי CD/DVD ריקים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "_צרוב תקליטור CD או DVD כאשר דיסק ריק מוכנס" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "פקודה לתקליטור _נתונים:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "פקודה לתקליטורי _שמע:" + +#. Multimedia +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "מולטימדיה" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "תקליטורי שמע" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "נגן תקליטורי _שמע כאשר מוכנסים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "_פקודה:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "תקליטורי וידאו CD/DVD" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "נגן תקליטורי _וידאו CD/DVD כאשר מוכנסים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "פ_קודה:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "נגני מוזיקה ניידים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "נגן קבצי _מוזיקה כאשר מחוברים" + +#. Cameras +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "מצלמות" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "מצלמות דיגיטליות" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "יבא תמונות דיגיטליות כאשר מחוברות" + +#. PDAs +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "מחשבי כף יד (PDA)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "סנכרן התקני _Palm™‎ כאשר מחוברים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "מחשבי כיס" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "סנכרן התקני _מחשב כיס כאשר מחוברים" + +#. Printers +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "מדפסות" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "הרץ אוטומטית תוכנית כאשר _מדפסת מחוברת" + +#. Input Devices +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "התקני קלט" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "מקלדות" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "הרץ אוטומטית תוכנית כאשר _מקלדת USB מחוברת" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "עכברים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "הרץ אוטומטית תוכנית כאשר עכ_בר USB מחובר" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "טאבלטים" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "הרץ תוכנית כאשר _מחשב לוח מחובר" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "פקו_דה:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "נכשל לפתוח דפדפן תיעוד" diff -Nru thunar-volman-0.6.1/po/hr.po thunar-volman-0.8.1/po/hr.po --- thunar-volman-0.6.1/po/hr.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/hr.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,31 +1,31 @@ -# Croatian translation for the thunar-volman package. -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. -# Ivica Kolić , 2011. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# schizo , 2014 +# Ivica Kolić , 2013 +# Ivica Kolić , 2011 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" -"PO-Revision-Date: 2011-05-28 16:45+0200\n" -"Last-Translator: Ivica Kolić \n" -"Language-Team: Croatian \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-02-21 14:26+0000\n" +"Last-Translator: schizo \n" +"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Country: CROATIA\n" "Language: hr\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Croatian\n" -"X-Poedit-SourceCharset: utf-8\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Syfs putanja novo dodanog uređaja" +msgid "The sysfs path of the newly added device" +msgstr "Syfs putanja novododanog uređaja" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Konfiguriraj upravljanje uklonjivih pogona i medija" @@ -35,25 +35,25 @@ msgstr "Ispiši informacije o verziji i izađi" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "" +msgstr "Thunar upravitelj particijama" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Sva prava pridržana." -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Prijavite probleme u <%s>." -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Nema uređaja sa sysfs putanjom \"%s\"" -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Morate odrediti sysfs putanju novih uređaja pomoću --device-added" @@ -65,7 +65,7 @@ #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" -msgstr "" +msgstr "Pronađene su fotografije na vašem prijenosnom sviraču glazbe" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -93,11 +93,11 @@ #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 msgid "Photo Import" -msgstr "" +msgstr "Uvoz fotografija" #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" -msgstr "" +msgstr "Otkrivena je kartica s fotografijama" #: ../thunar-volman/tvm-block-device.c:275 msgid "" @@ -111,7 +111,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "" +msgstr "Želite li dozvoliti pokretanje \"%s\"?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -121,7 +121,7 @@ #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid "Auto-Run capability detected" -msgstr "" +msgstr "Otkrivena sposobnost samopokretanja" #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 @@ -140,7 +140,7 @@ #: ../thunar-volman/tvm-block-device.c:506 msgid "Auto-Open capability detected" -msgstr "" +msgstr "Otkrivena sposobnost samootvaranja" #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" @@ -164,17 +164,17 @@ #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "" +msgstr "Particija montirana" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "" +msgstr "Particija \"%s\" je montirana automatski" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "" +msgstr "Umetnuta particija je montirana automatski" #: ../thunar-volman/tvm-block-device.c:694 #, c-format @@ -189,7 +189,7 @@ #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "" +msgstr "Ne mogu otkriti particiju koja odgovara ovom uređaju" #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" @@ -213,17 +213,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "" +msgid "Unknown block device type \"%s\"" +msgstr "Nepoznata vrsta uređaja za pohranjivanje \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Tip uređaja nije podržan" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "" +msgid "Device type \"%s\" not supported" +msgstr "Tip uređaja \"%s\" nije podržan" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -233,11 +229,6 @@ msgid "A keyboard was detected" msgstr "Tipkovnica je otkrivena" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -246,11 +237,7 @@ #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "" - -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" +msgstr "Otkriven je grafički tablet" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" @@ -262,8 +249,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "" +msgid "Unsupported input device type \"%s\"" +msgstr "Nepodržana vrsta ulaznog uređaja \"%s\"" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -276,7 +263,7 @@ #: ../thunar-volman/tvm-run.c:190 msgid "You have inserted a blank DVD." -msgstr "Umetnuli ste prazan DVD" +msgstr "Umetnuli ste prazan DVD." #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -292,7 +279,7 @@ #: ../thunar-volman/tvm-run.c:201 msgid "You have inserted a blank CD." -msgstr "Umetnuli ste prazan CD" +msgstr "Umetnuli ste prazan CD." #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" @@ -305,7 +292,7 @@ #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "" +msgstr "Naredba snimanja ne može biti prazna" #: ../thunar-volman/tvm-run.c:268 #, c-format @@ -330,15 +317,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Nepodržana vrsta USB uređaja" +msgid "Unsupported USB device type \"%s\"" +msgstr "Nepodržana vrsta USB uređaja \"%s\"" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "" +msgstr "Postavke Thunar upravitelja particijama" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Uklonjivi pogoni i mediji" @@ -369,10 +356,9 @@ #: ../thunar-volman-settings/tvm-command-entry.c:288 msgid "Shell Scripts" -msgstr "" +msgstr "Skripte ljuske" #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Pohrana" @@ -383,7 +369,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:158 msgid "_Mount removable drives when hot-plugged" -msgstr "" +msgstr "_Montiraj uklonjivi pogon kada je umetnut" #: ../thunar-volman-settings/tvm-preferences-dialog.c:166 msgid "Mount removable media when _inserted" @@ -415,10 +401,9 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "Naredba< za a_udio CD-e" +msgstr "Naredba< za a_udio CD-e:" #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedija" @@ -463,7 +448,6 @@ msgstr "Izvodi _glazbene datoteka kada je spojen" #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Kamere" @@ -474,10 +458,9 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "" +msgstr "Uvezi digitalne fotografije pri spajanju" #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -492,14 +475,13 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" -msgstr "" +msgstr "Džepna računala" #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" -msgstr "" +msgstr "Sinkroniziraj džepne P_C uređaje kada su spojeni" #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -507,10 +489,9 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "Automatski poreni program kada je _pisač spojen" +msgstr "Automatski pokreni program kada je _pisač spojen" #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Ulazni uređaji" @@ -520,7 +501,7 @@ msgstr "Tipkovnice" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" +msgid "Automatically run a program when a USB _keyboard is connected" msgstr "Automatski pokreni program kada je USB _tipkovnica spojena" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 @@ -528,7 +509,7 @@ msgstr "Miš" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" +msgid "Automatically run a program when a USB _mouse is connected" msgstr "Automatski pokreni program kada je USB _miš spojen" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 diff -Nru thunar-volman-0.6.1/po/hu.po thunar-volman-0.8.1/po/hu.po --- thunar-volman-0.6.1/po/hu.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/hu.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,30 +1,30 @@ -# Hungarian translation of thunar-volman -# Copyright 2009. Free Software Foundation, Inc. -# This file is distributed under the same license as the thunar-volman package. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # -# Gabor Kelemen , 2009, 2010. -# SZERVÁC Attila +# Translators: +# Nucleo , 2013 +# Gabor Kelemen , 2009-2010 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-15 21:15+0000\n" -"PO-Revision-Date: 2010-11-28 13:31+0100\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-10-04 01:14+0000\n" +"Last-Translator: Nucleo \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/xfce/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" +"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Az újonnan felvett eszköz sysfs-útvonala" +msgid "The sysfs path of the newly added device" +msgstr "Az újonnan hozzáadott eszköz sysfs-útvonala" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Cserélhető meghajtók és adathordozók kezelésének beállítása" @@ -38,25 +38,24 @@ msgid "Thunar Volume Manager" msgstr "Thunar kötetkezelő" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Minden jog fenntartva." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "A hibákat ide jelentse: <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Nincs „%s” sysfs-útvonalú eszköz" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"Az új eszközök sysfs-útvonalát a --device-added használatával kell megadni" +msgstr "Az új eszközök sysfs-útvonalát a --device-added használatával kell megadni" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -103,9 +102,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Fényképek találhatók a kártyán. Szeretné ezeket a fényképeket az albumához " -"adni?" +msgstr "Fényképek találhatók a kártyán. Szeretné ezeket a fényképeket az albumához adni?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -215,13 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Ismeretlen blokkeszköztípus" +msgid "Unknown block device type \"%s\"" +msgstr "Ismeretlen blokkeszköztípus: „%s”" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Az eszköztípus nem támogatott" +msgid "Device type \"%s\" not supported" +msgstr "Az eszköztípus ( „%s”) nem támogatott" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -251,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Nem támogatott bemenetieszköz-típus" +msgid "Unsupported input device type \"%s\"" +msgstr "Nem támogatott bemenetieszköz-típus ( „%s”)" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -319,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Nem támogatott USB-eszköztípus" +msgid "Unsupported USB device type \"%s\"" +msgstr "Nem támogatott USB-eszköztípus ( „%s”)" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunar kötetkezelő beállításai" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Cserélhető meghajtók és adathordozók" @@ -535,12 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "A dokumentációböngésző megnyitása meghiúsult" - -#~ msgid "input-keyboard" -#~ msgstr "bemenet-billentyűzet" - -#~ msgid "input-tablet" -#~ msgstr "bemenet-táblagép" - -#~ msgid "input-mouse" -#~ msgstr "bemenet-egér" diff -Nru thunar-volman-0.6.1/po/id.po thunar-volman-0.8.1/po/id.po --- thunar-volman-0.6.1/po/id.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/id.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,27 +1,29 @@ -# Indonesian translations for thunar-volman package. -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. -# Andhika Padmawan , 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# padmawan , 2008,2014 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-30 12:00+0000\n" -"PO-Revision-Date: 2008-09-03 21:13+0700\n" -"Last-Translator: Andhika Padmawan \n" -"Language-Team: Indonesian \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-01-25 08:55+0000\n" +"Last-Translator: padmawan \n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/xfce/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "Alamat sysfs dari divais yang baru ditambah" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Pengaturan manajemen dari media dan penggerak dapat dilepas" @@ -35,21 +37,21 @@ msgid "Thunar Volume Manager" msgstr "Manajer Volume Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Hak cipta dilindungi undang-undang." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Silakan laporkan kutu ke <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Tak ada divais dengan alamat sysfs \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Harus ditentukan alamat sysfs divais baru dengan --device-added" @@ -99,8 +101,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Ada foto di dalam kartu. Anda ingin menyertakan foto ini ke dalam album anda?" +msgstr "Ada foto di dalam kartu. Anda ingin menyertakan foto ini ke dalam album anda?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -210,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Tipe divais blok tidak diketahui" +msgid "Unknown block device type \"%s\"" +msgstr "Tipe divais blok tidak diketahui: \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Tipe divais tidak didukung" +msgid "Device type \"%s\" not supported" +msgstr "Tipe divais \"%s\" tidak didukung" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -246,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Tipe divais masukan tak didukung" +msgid "Unsupported input device type \"%s\"" +msgstr "Tipe divais masukan \"%s\" tidak didukung" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -314,15 +315,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Tipe divais USB tak didukung" +msgid "Unsupported USB device type \"%s\"" +msgstr "Tipe divais USB \"%s\" tidak didukung" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Pengaturan Manajer Volume Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Media dan Penggerak Dapat Dilepas" @@ -356,7 +357,6 @@ msgstr "Skrip Shell" #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Penyimpan" @@ -402,7 +402,6 @@ msgstr "Perintah untuk CD A_udio:" #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" @@ -447,7 +446,6 @@ msgstr "Putar berkas _musik ketika tersambung" #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Kamera" @@ -461,7 +459,6 @@ msgstr "Impor foto digital ketika tersambung" #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA" @@ -483,7 +480,6 @@ msgstr "Sinkronasi divais P_C Saku ketika tersambung" #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -494,7 +490,6 @@ msgstr "Otomatis menjalankan program ketika _pencetak tersambung" #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Divais Masukan" @@ -530,69 +525,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Gagal membuka peramban dokumentasi" - -#~ msgid "input-keyboard" -#~ msgstr "masukan-papan ketik" - -#~ msgid "input-tablet" -#~ msgstr "masukan-tablet" - -#~ msgid "input-mouse" -#~ msgstr "masukan-tetikus" - -#~ msgid "Failed to open display" -#~ msgstr "Gagal membuka tampilan" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Tim pengembang Thunar. Hak cipta dilindungi undang-undang." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Ditulis oleh Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "UDI \"%s\" yang ditentukan bukan UDI divais HAL yang sah" - -#~ msgid "Encrypted volume" -#~ msgstr "Volume terenkripsi" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Mengaitkan volume terenkripsi..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Mengatur lapisan kripto..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Anda tidak diizinkan untuk mengatur lapisan kripto" - -#~ msgid "Wrong password" -#~ msgstr "Sandi lewat salah" - -#~ msgid "Wrong password." -#~ msgstr "Sandi lewat salah." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Volume ini terenkripsi." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Silakan masukkan sandi lewat anda untuk mendekripsi dan mengaitkan volume." - -#~ msgid "_Mount" -#~ msgstr "_Kait" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Gagal untuk mengatur volume terenkripsi" - -#~ msgid "Choose Disc Type" -#~ msgstr "Pilih Tipe Cakram" - -#~ msgid "Make _DVD" -#~ msgstr "Buat _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Media Dapat Dilepas" diff -Nru thunar-volman-0.6.1/po/is.po thunar-volman-0.8.1/po/is.po --- thunar-volman-0.6.1/po/is.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/is.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,29 +1,29 @@ -# translation of thunar-volman.master.thunar-volman.po to Icelandic +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Sveinn í Felli , 2011. +# +# Translators: +# Sveinn í Felli , 2011,2013 msgid "" msgstr "" -"Project-Id-Version: thunar-volman.master.thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" -"PO-Revision-Date: 2011-12-03 08:37+0000\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-02 09:09+0000\n" "Last-Translator: Sveinn í Felli \n" -"Language-Team: Icelandic \n" -"Language: \n" +"Language-Team: Icelandic (http://www.transifex.com/projects/p/xfce/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: is\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "" +msgid "The sysfs path of the newly added device" +msgstr "sysfs-slóð nýviðbætta tækisins" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Stilla umsýslu á fjarlægjanlegum drifum og miðlum" @@ -33,41 +33,41 @@ msgstr "Prenta upplýsingar um útgáfu og hætta" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "" +msgstr "Thunar diskastjóri" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." -msgstr "" +msgstr "Öll réttindi áskilin." -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Tilkynntu villur til <%s>." -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "" +msgstr "Það er ekkert tæki með sysfs-slóðina \"%s\"" -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" +msgstr "Verður að tilgreina sysfs-slóð nýrra tækja með --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 msgid "Photos and Music" -msgstr "" +msgstr "Ljósmyndir og tónlist" #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" -msgstr "" +msgstr "Myndir fundust á tónlistarspilaranum þínum" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" -msgstr "" +msgstr "Viltu flytja inn myndirnar eða sýsla með tónlistina?" #: ../thunar-volman/tvm-block-device.c:208 #: ../thunar-volman/tvm-block-device.c:277 @@ -77,31 +77,31 @@ #: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid "Ig_nore" -msgstr "" +msgstr "Hu_nsa" #: ../thunar-volman/tvm-block-device.c:209 #: ../thunar-volman/tvm-block-device.c:278 msgid "Import _Photos" -msgstr "" +msgstr "_Flytja inn myndir" #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" -msgstr "" +msgstr "Sýsla með _tónlist" #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 msgid "Photo Import" -msgstr "" +msgstr "Innflutningur ljósmynda" #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" -msgstr "" +msgstr "Ljósmyndaminniskort fannst" #: ../thunar-volman/tvm-block-device.c:275 msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" +msgstr "Það eru myndir á minniskortinu. Viltu bæta þessum myndum í albúmið þitt?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -109,36 +109,36 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "" +msgstr "Viltu leyfa keyrslu á \"%s\" ?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 msgid "Auto-Run Confirmation" -msgstr "" +msgstr "Staðfesting sjálfkeyrslu" #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid "Auto-Run capability detected" -msgstr "" +msgstr "Fann sjálfkeyrslueiginleika (Auto-Run)" #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 msgid "_Allow Auto-Run" -msgstr "" +msgstr "_Leyfa sjálfkeyrslu" #. prompt the user whether to autoopen this file #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "" +msgstr "Viltu opna \"%s\"?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" -msgstr "" +msgstr "Staðfesting sjálfopnunar" #: ../thunar-volman/tvm-block-device.c:506 msgid "Auto-Open capability detected" -msgstr "" +msgstr "Fann sjálfopnunareiginleika (Auto-Open)" #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" @@ -146,64 +146,64 @@ #: ../thunar-volman/tvm-block-device.c:619 msgid "CD mounted" -msgstr "" +msgstr "CD tengdur í skráakerfi" #: ../thunar-volman/tvm-block-device.c:619 msgid "DVD mounted" -msgstr "" +msgstr "DVD tengdur í skráakerfi" #: ../thunar-volman/tvm-block-device.c:621 msgid "The CD was mounted automatically" -msgstr "" +msgstr "CD-diskurinn var sjálfvirkt tengdur í skráakerfi" #: ../thunar-volman/tvm-block-device.c:622 msgid "The DVD was mounted automatically" -msgstr "" +msgstr "DVD-diskurinn var sjálfvirkt tengdur í skráakerfi" #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "" +msgstr "Gagnageymsla tengd" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "" +msgstr "Gagnageymslan \"%s\" var sjálfvirkt tengd í skráakerfi" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "" +msgstr "Gagnageymslan sem sett var inn var sjálfvirkt tengd í skráakerfi" #: ../thunar-volman/tvm-block-device.c:694 #, c-format msgid "Unable to locate mount point" -msgstr "" +msgstr "Fann ekki tengipunkt" #: ../thunar-volman/tvm-block-device.c:740 #, c-format msgid "Unable to mount the device" -msgstr "" +msgstr "Ekki tókst að tengja tækið" #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "" +msgstr "Gat ekki fundið gagnageymsluna sem tilheyrir tækinu" #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "" +msgstr "Hljóð-/gagnadiskur" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" -msgstr "" +msgstr "CD-diskurinn í drifinu inniheldur bæði tónlist og skrár" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "" +msgstr "Viltu hlusta á tónlistina eða skoða skrárnar?" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" -msgstr "" +msgstr "S_koða skrár" #: ../thunar-volman/tvm-block-device.c:831 msgid "_Play CD" @@ -211,70 +211,57 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "" +msgid "Unknown block device type \"%s\"" +msgstr "Óþekkt tegund blokkartækis (block device) \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "" +msgid "Device type \"%s\" not supported" +msgstr "Þessi tegund tækis; \"%s\" er ekki studd ennþá" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" -msgstr "" +msgstr "Lyklaborð fannst" #: ../thunar-volman/tvm-input-device.c:76 msgid "A keyboard was detected" -msgstr "" - -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "" +msgstr "Lyklaborð fannst sjálfvirkt" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" -msgstr "" +msgstr "Teiknitafla fannst" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "" - -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" +msgstr "Teiknitafla fannst sjálfvirkt" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" -msgstr "" +msgstr "Mús fannst" #: ../thunar-volman/tvm-input-device.c:112 msgid "A mouse was detected" -msgstr "" +msgstr "Mús fannst á kerfinu" #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "" +msgid "Unsupported input device type \"%s\"" +msgstr "Óstudd tegund blokkartækis (block device) \"%s\"" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "" +msgstr "Sjálfvirk brennsla auðra CD og DVD geisladiska er óvirk" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" -msgstr "" +msgstr "Tómur DVD geisladiskur var settur inn" #: ../thunar-volman/tvm-run.c:190 msgid "You have inserted a blank DVD." -msgstr "" +msgstr "Þú varst að setja inn tóman DVD geisladisk." #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -282,7 +269,7 @@ #: ../thunar-volman/tvm-run.c:193 msgid "Burn _DVD" -msgstr "" +msgstr "Brenna _DVD" #: ../thunar-volman/tvm-run.c:200 msgid "Blank CD inserted" @@ -290,25 +277,25 @@ #: ../thunar-volman/tvm-run.c:201 msgid "You have inserted a blank CD." -msgstr "" +msgstr "Þú varst að setja inn tóman CD geisladisk." #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" -msgstr "" +msgstr "Brenna _gagna-CD" #: ../thunar-volman/tvm-run.c:205 msgid "Burn _Audio CD" -msgstr "" +msgstr "_Brenna CD-hljóðdisk" #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "" +msgstr "Brennsluskipunin má ekki vera auð" #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "" +msgstr "Skipun fyrir CD afspilun er óskilgreind" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" @@ -316,7 +303,7 @@ #: ../thunar-volman/tvm-usb-device.c:63 msgid "A photo camera was detected" -msgstr "" +msgstr "Myndavél fannst sjálfvirkt" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" @@ -324,19 +311,19 @@ #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "" +msgstr "USB-prentari fannst" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "" +msgid "Unsupported USB device type \"%s\"" +msgstr "Óstudd tegund USB-tækis \"%s\"" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "" +msgstr "Stillingar Thunar diskastjóra" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Fjarlægjanleg drif og miðlar" @@ -369,9 +356,8 @@ msgid "Shell Scripts" msgstr "Skeljarskriftur" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Geymsla" @@ -382,43 +368,42 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:158 msgid "_Mount removable drives when hot-plugged" -msgstr "" +msgstr "Te_ngja útskiptanlega diska á keyrslu (hot-plugged)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:166 msgid "Mount removable media when _inserted" -msgstr "" +msgstr "Teng_ja útskiptanlega miðla þegar þeir eru settir í samband" #: ../thunar-volman-settings/tvm-preferences-dialog.c:174 msgid "B_rowse removable media when inserted" -msgstr "" +msgstr "Vaf_ra um útskiptanlega miðla þegar þeir eru settir inn" #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" -msgstr "" +msgstr "Sjálfkeyra forrit á nýjum drifum og öðrum gagnamiðlum" #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" -msgstr "" +msgstr "Sjálfopna skrár á nýjum drifum og öðrum gagnamiðlum" #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" -msgstr "" +msgstr "Auðir CD og DVD geisladiskar" #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" -msgstr "" +msgstr "_Brenna CD eða DVD þegar geisladiskur var settur inn" #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" -msgstr "" +msgstr "Skipun fyrir C_D-gagnadisk" #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "" +msgstr "Skipun fyrir _CD-hljóðdisk" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Margmiðlun" @@ -429,7 +414,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "" +msgstr "Spil_a CD-hljóðdiska þegar þeir eru settir inn" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -441,11 +426,11 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:304 msgid "Video CDs/DVDs" -msgstr "" +msgstr "CD/DVD mynddiskar" #: ../thunar-volman-settings/tvm-preferences-dialog.c:321 msgid "Play _video CDs and DVDs when inserted" -msgstr "" +msgstr "S_pila CD og DVD mynddiska þegar þeir eru settir inn" #: ../thunar-volman-settings/tvm-preferences-dialog.c:329 #: ../thunar-volman-settings/tvm-preferences-dialog.c:367 @@ -460,11 +445,10 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" -msgstr "" +msgstr "Spi_la tónlistarskrár við tengingu" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Myndavélar" @@ -475,11 +459,10 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "" +msgstr "Flytja inn stafrænar ljósmyndir við tengingu" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "Lófatölvur" @@ -490,7 +473,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:458 msgid "Sync _Palm™ devices when connected" -msgstr "" +msgstr "Samræma _Palm™ tæki við tengingu" #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" @@ -498,11 +481,10 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" -msgstr "" +msgstr "Samræma Pocket P_C tæki við tengingu" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -510,11 +492,10 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "" +msgstr "Keyra sjálfkrafa forrit þegar _prentari er tengdur" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Inntakstæki" @@ -524,16 +505,16 @@ msgstr "Lyklaborð" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" -msgstr "" +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "Keyra sjálfkrafa forrit þegar USB _lyklaborð er tengt" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" -msgstr "" +msgstr "Mýs" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" -msgstr "" +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Keyra sjálfkrafa forrit þegar USB _mús er tengd" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -541,7 +522,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "" +msgstr "Keyra sjálfkrafa forrit þegar _teiknibretti er tengt" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" @@ -549,5 +530,4 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" -msgstr "" - +msgstr "Mistókst að opna skjalavafrann" diff -Nru thunar-volman-0.6.1/po/it.po thunar-volman-0.8.1/po/it.po --- thunar-volman-0.6.1/po/it.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/it.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,34 +1,30 @@ -# Italian translations for thunar-volman package. -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. -# Fabio Riga , 2007. -# Cristian Marchi , 2010. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# cri , 2010,2013 +# Fabio Riga , 2007 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-24 11:00+0000\n" -"PO-Revision-Date: 2011-02-07 14:26+0100\n" -"Last-Translator: Cristian Marchi \n" -"Language-Team: Italian Translation Team \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-24 10:14+0000\n" +"Last-Translator: cri \n" +"Language-Team: Italian (http://www.transifex.com/projects/p/xfce/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -# GLOSSARIO -# device = dispositivo -# drive = unità -# encrypted = cifrato -# media = disco (non è un contenuto ma bensì il supporto) #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Il percorso syfs del nuovo dispositivo aggiunto" +msgid "The sysfs path of the newly added device" +msgstr "Il percorso sysfs del nuovo dispositivo aggiunto" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Configurazione della gestione delle unità rimovibili e dei dischi" @@ -42,26 +38,24 @@ msgid "Thunar Volume Manager" msgstr "Gestore dei volumi di Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Tutti i diritti riservati" -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Segnalare i problemi a <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Non c'è alcun dispositivo con il percorso sysfs \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"Si deve specificare il percorso sysfs del nuovo dispositivo aggiunto con --" -"device-added" +msgstr "Si deve specificare il percorso sysfs del nuovo dispositivo aggiunto con --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -74,7 +68,7 @@ #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" -msgstr "Si desidera importare le foto o gestire la musica?" +msgstr "Importare le foto o gestire la musica?" #: ../thunar-volman/tvm-block-device.c:208 #: ../thunar-volman/tvm-block-device.c:277 @@ -198,7 +192,7 @@ #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "CD Audio o dati" +msgstr "CD audio o dati" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" @@ -206,7 +200,7 @@ #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "Si desidera ascoltare la musica o sfogliare i file?" +msgstr "Ascoltare la musica o sfogliare i file?" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" @@ -218,13 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Tipo di blocco del dispositivo sconosciuto" +msgid "Unknown block device type \"%s\"" +msgstr "Tipo di dispositivo di blocco \"%s\" sconosciuto" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Tipo di dispositivo non supportato" +msgid "Device type \"%s\" not supported" +msgstr "Tipo di dispositivo \"%s\" non supportato" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -242,7 +236,7 @@ #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "È stata rilevata una tavoletta" +msgstr "È stata rilevata una tavoletta grafica" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" @@ -254,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Tipo di dispositivo non supportato" +msgid "Unsupported input device type \"%s\"" +msgstr "Tipo di dispositivo di input \"%s\" non supportato" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -302,7 +296,7 @@ #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "Il comando per la riproduzione dei CD non è definito" +msgstr "Il comando per la riproduzione del CD non è definito" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" @@ -322,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Tipo di dispositivo USB non supportato" +msgid "Unsupported USB device type \"%s\"" +msgstr "Tipo di dispositivo USB \"%s\" non supportato" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Impostazioni del gestore dei volumi di Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Unità rimovibili e dischi" @@ -371,7 +365,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:141 msgid "Removable Storage" -msgstr "Dispositivi rimovibili di archiviazione" +msgstr "Dispositivi di archiviazione rimovibili" #: ../thunar-volman-settings/tvm-preferences-dialog.c:158 msgid "_Mount removable drives when hot-plugged" @@ -499,13 +493,13 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "Esegui un programma alla connessione di una _stampante" +msgstr "Esegui automaticamente un programma alla connessione di una _stampante" #. Input Devices #. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" -msgstr "Dispositivi di ingresso" +msgstr "Dispositivi di input" #: ../thunar-volman-settings/tvm-preferences-dialog.c:576 msgid "Keyboards" @@ -513,8 +507,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "" -"Esegui automaticamente un programma alla connessione di una _tastiera USB" +msgstr "Esegui automaticamente un programma alla connessione di una _tastiera USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" @@ -530,7 +523,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "Esegui un programma alla connessione di una ta_voletta" +msgstr "Esegui automaticamente un programma alla connessione di una ta_voletta" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" @@ -539,68 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Impossibile aprire il navigatore della documentazione" - -#~ msgid "input-keyboard" -#~ msgstr "input-tastiera" - -#~ msgid "input-tablet" -#~ msgstr "input-tavoletta" - -#~ msgid "input-mouse" -#~ msgstr "input-mouse" - -#~ msgid "Failed to open display" -#~ msgstr "Apertura dello schermo non riuscita" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Il gruppo di sviluppo di Thunar. Tutti i diritti riservati." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Scritto da Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "L'UDI \"%s\" specificato non è un UDI HAL di dispositivo valido" - -#~ msgid "Encrypted volume" -#~ msgstr "Volume cifrato" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Montaggio del volume cifrato in " -#~ "corso..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Impostazione del livello cifrato in corso..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Non si posseggono i privilegi per impostare il livello cifrato" - -#~ msgid "Wrong password" -#~ msgstr "Password errata" - -#~ msgid "Wrong password." -#~ msgstr "Password errata." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Questo volume è cifrato." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Inserire la password per decifrare e montare il volume." - -#~ msgid "_Mount" -#~ msgstr "_Monta" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Impostazione del volume cifrato non riuscita" - -#~ msgid "Choose Disc Type" -#~ msgstr "Scegliere il tipo di disco" - -#~ msgid "Make _DVD" -#~ msgstr "Crea _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Dispositivi rimovibili" diff -Nru thunar-volman-0.6.1/po/ja.po thunar-volman-0.8.1/po/ja.po --- thunar-volman-0.6.1/po/ja.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ja.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,17 +1,17 @@ -# Japanese translations for thunar-volman package -# Copyright (C) 2008 Benedikt Meurer +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# HASHIMOTO Masato , 2008. -# Nobuhiro Iwamatsu , 2008. # +# Translators: +# Nobuhiro Iwamatsu , 2008 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-23 11:45+0000\n" -"PO-Revision-Date: 2011-01-17 17:26+0900\n" -"Last-Translator: Masato Hashimoto \n" -"Language-Team: Japanese \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-12-08 11:57+0000\n" +"Last-Translator: Masato HASHIMOTO \n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/xfce/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,11 +19,11 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "新たに追加されたデバイスの Sysfs パス" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "リムーバブルドライブとメディアの取扱いを設定します" @@ -35,27 +35,26 @@ #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Thunar ボリュームマネージャ" +msgstr "Thunar ボリュームマネージャー" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "All rights reserved." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "バグの報告は <%s> までお願いします。" -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Sysfs パス \"%s\" にデバイスはありません" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"--device-added オプションで新しいデバイスの Sysfs パスを指定してください" +msgstr "--device-added オプションで新しいデバイスの Sysfs パスを指定してください" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -64,7 +63,7 @@ #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" -msgstr "携帯音楽プレイヤー内に写真が見つかりました" +msgstr "携帯音楽プレーヤー内に写真が見つかりました" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -212,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "未知のブロックデバイスタイプです" +msgid "Unknown block device type \"%s\"" +msgstr "\"%s\" は未知のブロックデバイスタイプです" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "デバイスタイプはサポートされていません" +msgid "Device type \"%s\" not supported" +msgstr "デバイスタイプ \"%s\" はサポートされていません" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -248,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "未サポートの入力デバイスタイプです" +msgid "Unsupported input device type \"%s\"" +msgstr "\"%s\" は未サポートの入力デバイスタイプです" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -296,7 +295,7 @@ #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "CD プレイヤーコマンドが定義されていません" +msgstr "CD プレーヤーコマンドが定義されていません" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" @@ -308,23 +307,23 @@ #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" -msgstr "プリンタを検出しました" +msgstr "プリンターを検出しました" #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "USB プリンタが検出されました" +msgstr "USB プリンターが検出されました" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "未サポートの USB デバイスタイプです" +msgid "Unsupported USB device type \"%s\"" +msgstr "\"%s\" は未サポートの USB デバイスタイプです" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Thunar ボリュームマネージャ設定" +msgstr "Thunar ボリュームマネージャー設定" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "リムーバブルドライブとメディア" @@ -442,7 +441,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:343 msgid "Portable Music Players" -msgstr "携帯音楽プレイヤー" +msgstr "携帯音楽プレーヤー" #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" @@ -489,11 +488,11 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" -msgstr "プリンタ" +msgstr "プリンター" #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "プリンタが接続されたら自動的にプログラムを実行する(_P)" +msgstr "プリンターが接続されたら自動的にプログラムを実行する(_P)" #. Input Devices #. @@ -531,72 +530,4 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" -msgstr "ドキュメントブラウザのオープンに失敗しました" - -#~ msgid "input-keyboard" -#~ msgstr "input-keyboard" - -#~ msgid "input-tablet" -#~ msgstr "input-tablet" - -#~ msgid "input-mouse" -#~ msgstr "input-mouse" - -#~ msgid "Failed to open display" -#~ msgstr "ディスプレイのオープンに失敗しました" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "The Thunar development team. All rights reserved." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Benedikt Meurer が製作しました。" - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "指定された UDI \"%s\" は正常な HAL デバイス UDI ではありません" - -#~ msgid "Encrypted volume" -#~ msgstr "暗号化ボリューム" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "暗号化ボリュームをマウントしていま" -#~ "す..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "暗号レイヤをセットアップしています..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "暗号レイヤをセットアップする権限が与えられていません" - -#~ msgid "Wrong password" -#~ msgstr "パスワードが正しくありません" - -#~ msgid "Wrong password." -#~ msgstr "" -#~ "パスワードが正しくありません。" - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "このボリュームは暗号化されています。" -#~ "" - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "ボリュームの暗号解読とマウントのためパスワードを入力してください。" - -#~ msgid "_Mount" -#~ msgstr "マウント(_M)" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "暗号化ボリュームのセットアップに失敗しました" - -#~ msgid "Choose Disc Type" -#~ msgstr "ディスクタイプの選択" - -#~ msgid "Make _DVD" -#~ msgstr "DVD を作成する(_D)" - -#~ msgid "Removable Media" -#~ msgstr "リムーバブルメディア" +msgstr "ドキュメントブラウザーのオープンに失敗しました" diff -Nru thunar-volman-0.6.1/po/kk.po thunar-volman-0.8.1/po/kk.po --- thunar-volman-0.6.1/po/kk.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/kk.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,28 +1,29 @@ -# thunar-volman to kazakh. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Baurzhan Muftakhidinov , 2010. # +# Translators: +# Baurzhan Muftakhidinov , 2010,2013 msgid "" msgstr "" -"Project-Id-Version: trunk\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-24 05:12+0000\n" -"PO-Revision-Date: 2010-10-19 09:08+0600\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-25 02:18+0000\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: kk\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Жаңа салынған құрылғының syfs жолы" +msgid "The sysfs path of the newly added device" +msgstr "Жаңа салынған құрылғының sysfs жолы" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Ауыстырмалы тасушылар мен дисктерді басқару" @@ -36,21 +37,21 @@ msgid "Thunar Volume Manager" msgstr "Thunar тасушылар басқарушысы" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Барлық құқықтары қорғалған." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Ақаулықтар жөнінде хабарласыңыз: <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "sysfs жолы \"%s\" болатын құрылғы жоқ" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Жаңа құрылғылар үшін syfs жолын --device-added көмегімен көрсету керек" @@ -100,9 +101,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Картадан фотосуреттер табылды. Осы суреттерді альбомыңызға қосуды қалайсыз " -"ба?" +msgstr "Картадан фотосуреттер табылды. Осы суреттерді альбомыңызға қосуды қалайсыз ба?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -212,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Белгісіз блоктық құрылғы түрі" +msgid "Unknown block device type \"%s\"" +msgstr "Белгісіз блоктық құрылғы түрі \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Құрылғы түріне қолдау жоқ" +msgid "Device type \"%s\" not supported" +msgstr "Құрылғы \"%s\" түріне қолдау жоқ" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -248,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Енгізу құрылғының осы түрі үшін қолдау жоқ" +msgid "Unsupported input device type \"%s\"" +msgstr "Енгізу құрылғының \"%s\" түрі үшін қолдау жоқ" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -316,15 +315,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Қолдауы жоқ USB құрылғы түрі" +msgid "Unsupported USB device type \"%s\"" +msgstr "Қолдауы жоқ \"%s\" USB құрылғы түрі" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunar тасушылар басқарушысы баптаулары" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Ауыстырмалы дисктер мен тасушылар" @@ -532,68 +531,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Құжаттама шолушысын ашу сәтсіз аяқталды" - -#~ msgid "input-keyboard" -#~ msgstr "input-keyboard" - -#~ msgid "input-tablet" -#~ msgstr "input-tablet" - -#~ msgid "input-mouse" -#~ msgstr "input-mouse" - -#~ msgid "Failed to open display" -#~ msgstr "Дисплейді ашу сәтсіз аяқталды" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Thunar өндіру тобы. Барлық құқықтары қорғалған." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Benedikt Meurer жазған." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Көрсетілген \"%s\" UDI дұрыс HAL құрылғы UDI-і емес" - -#~ msgid "Encrypted volume" -#~ msgstr "Шифрленген диск бөлімі" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Шифрленген диск бөлімін тіркеу..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Крипто деңгейін баптау..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Крипто деңгейін баптауға құқығыңыз жоқ" - -#~ msgid "Wrong password" -#~ msgstr "Пароль қате" - -#~ msgid "Wrong password." -#~ msgstr "Пароль қате." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Бұл диск бөлімі шифрленген." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Шифрленген бөлімді оқу мен тіркеу үшін парольді көрсетіңіз." - -#~ msgid "_Mount" -#~ msgstr "Ті_ркеу" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Шифрленген бөлімді баптау сәтсіз ақталды" - -#~ msgid "Choose Disc Type" -#~ msgstr "Диск түрін таңдаңыз" - -#~ msgid "Make _DVD" -#~ msgstr "DVD ж_асау" - -#~ msgid "Removable Media" -#~ msgstr "Ауыстырмалы тасымалдағыштар" diff -Nru thunar-volman-0.6.1/po/ko.po thunar-volman-0.8.1/po/ko.po --- thunar-volman-0.6.1/po/ko.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ko.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,63 +1,60 @@ -# Korean translations for thunar-volman package. -# Copyright (C) 2006-2011 The Xfce development team. -# This file is distributed under the same license as the thunar-volman package. -# -# Seong-ho, Cho , 2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Darkcircle , 2011-2013 msgid "" msgstr "" -"Project-Id-Version: thunar-volman.master\n" -"Report-Msgid-Bugs-To: xfce4-users-kr-i18n \n" -"POT-Creation-Date: 2012-02-27 09:21+0000\n" -"PO-Revision-Date: 2012-02-27 23:37+0900\n" -"Last-Translator: Seong-ho, Cho \n" -"Language-Team: xfce4-users-kr-i18n \n" -"Language: ko\n" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-21 06:22+0000\n" +"Last-Translator: Darkcircle \n" +"Language-Team: Korean (http://www.transifex.com/projects/p/xfce/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Korean\n" -"X-Poedit-Country: KOREA, REPUBLIC OF\n" -"X-Poedit-SourceCharset: utf-8\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "새롭게 추가된 장치의 sysfs 경로" +msgid "The sysfs path of the newly added device" +msgstr "새로 추가한 장치의 sysfs 경로입니다" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "이동식 드라이브와 미디어에 대한 관리를 설정합니다" +msgstr "이동식 드라이브와 미디어의 관리요소를 설정합니다" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "버전 정보를 출력하고 끝냅니다" +msgstr "버전 정보를 출력하고 나갑니다" #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Thunar 볼륨 관리자" +msgstr "투나 볼륨 관리자" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "All rights reserved." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." -msgstr "<%s>로 버그를 알려주시기 바랍니다." +msgstr "<%s>(으)로 버그를 알려주십시오." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "sysfs 경로 \"%s\"에 장치가 없습니다 " +msgstr "\"%s\" sysfs 경로에 장치가 없습니다" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "--device-added로 새 장치의 sysfs 경로를 지정하여야 합니다" +msgstr "--device-added 옵션으로 새 장치의 sysfs 경로를 지정해야 합니다" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -77,8 +74,7 @@ #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid "Ig_nore" msgstr "무시(_N)" @@ -90,7 +86,7 @@ #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" -msgstr "음악 관리하기(_M)" +msgstr "음악 관리(_M)" #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 @@ -99,11 +95,13 @@ #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" -msgstr "사진 카드가 감지되었습니다" +msgstr "사진 카드를 감지했습니다" #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" -msgstr "카드에 사진이 들어있습니다. 앨범에 이 사진을 더하시렵니까?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "카드에 사진이 들어있습니다. 앨범에 이 사진을 추가하시렵니까?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -111,7 +109,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "실행을 위해 \"%s\"을(를) 허용하시렵니까?" +msgstr "\"%s\" 실행을 허용하시렵니까?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -121,7 +119,7 @@ #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid "Auto-Run capability detected" -msgstr "자동 실행 가능성이 감지됨" +msgstr "자동 실행 기능 감지함" #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 @@ -140,7 +138,7 @@ #: ../thunar-volman/tvm-block-device.c:506 msgid "Auto-Open capability detected" -msgstr "자동 열기 가능성이 감지됨" +msgstr "자동 열기 기능 감지함" #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" @@ -148,38 +146,38 @@ #: ../thunar-volman/tvm-block-device.c:619 msgid "CD mounted" -msgstr "CD 마운트 됨" +msgstr "CD 마운트함" #: ../thunar-volman/tvm-block-device.c:619 msgid "DVD mounted" -msgstr "DVD 마운트 됨" +msgstr "DVD 마운트함" #: ../thunar-volman/tvm-block-device.c:621 msgid "The CD was mounted automatically" -msgstr "CD가 자동으로 마운트되었습니다" +msgstr "CD를 자동으로 마운트했습니다" #: ../thunar-volman/tvm-block-device.c:622 msgid "The DVD was mounted automatically" -msgstr "DVD가 자동으로 마운트되었습니다" +msgstr "DVD를 자동으로 마운트했습니다" #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "볼륨 마운트 됨" +msgstr "볼륨 마운트함" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "볼륨 \"%s\"이(가) 자동으로 마운트되었습니다" +msgstr "\"%s\" 볼륨을 자동으로 마운트했습니다" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "삽입된 볼륨이 자동으로 마운트되었습니다" +msgstr "삽입한 볼륨을 자동으로 마운트했습니다" #: ../thunar-volman/tvm-block-device.c:694 #, c-format msgid "Unable to locate mount point" -msgstr "마운트 지점을 지정할 수 없습니다" +msgstr "마운트 위치를 지정할 수 없습니다" #: ../thunar-volman/tvm-block-device.c:740 #, c-format @@ -193,11 +191,11 @@ #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "음악/데이터 CD" +msgstr "오디오/데이터 CD" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" -msgstr "드라이브에 있는 CD에 파일과 음악들이 포함되어 있습니다" +msgstr "드라이브에 있는 CD에 파일과 음악이 들어있습니다" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" @@ -209,64 +207,63 @@ #: ../thunar-volman/tvm-block-device.c:831 msgid "_Play CD" -msgstr "CD 재생하기(_P)" +msgstr "CD 재생(_P)" #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "알 수 없는 블록 장치 유형" +msgid "Unknown block device type \"%s\"" +msgstr "알 수 없는 블록 장치 형식 \"%s\" 입니다" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "장치 유형이 지원되지 않습니다" +msgid "Device type \"%s\" not supported" +msgstr "\"%s\" 장치 형식을 지원하지 않습니다" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" -msgstr "키보드 감지됨" +msgstr "키보드 감지함" #: ../thunar-volman/tvm-input-device.c:76 msgid "A keyboard was detected" -msgstr "키보드가 감지되었습니다" +msgstr "키보드를 감지했습니다" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" -msgstr "태블릿 감지됨" +msgstr "태블릿 감지함" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "그래픽 태블릿이 감지되었습니다" +msgstr "그래픽 태블릿을 감지했습니다" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" -msgstr "마우스 감지됨" +msgstr "마우스 감지함" #: ../thunar-volman/tvm-input-device.c:112 msgid "A mouse was detected" -msgstr "마우스가 감지되었습니다" +msgstr "마우스를 감지했습니다" #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "지원되지 않는 입력 장치 우횽" +msgid "Unsupported input device type \"%s\"" +msgstr "지원하지 않는 입력 장치 형식 \"%s\" 입니다" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "빈 CD와 DVD 자동굽기가 비활성화되었습니다." +msgstr "빈 CD와 DVD 자동굽기를 비활성화했습니다" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" -msgstr "빈 DVD 삽입됨" +msgstr "빈 DVD 삽입함" #: ../thunar-volman/tvm-run.c:190 msgid "You have inserted a blank DVD." -msgstr "빈 DVD가 삽입되어 있습니다." +msgstr "빈 DVD를 삽입했습니다." -#: ../thunar-volman/tvm-run.c:191 -#: ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" msgstr "무엇을 하시렵니까?" @@ -276,11 +273,11 @@ #: ../thunar-volman/tvm-run.c:200 msgid "Blank CD inserted" -msgstr "빈 CD 삽입됨" +msgstr "빈 CD 삽입함" #: ../thunar-volman/tvm-run.c:201 msgid "You have inserted a blank CD." -msgstr "빈 CD가 삽입되어 있습니다." +msgstr "빈 CD를 삽입했습니다." #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" @@ -288,45 +285,45 @@ #: ../thunar-volman/tvm-run.c:205 msgid "Burn _Audio CD" -msgstr "음악 CD 굽기(_A)" +msgstr "오디오 CD 굽기(_A)" #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "굽기 명령은 비어있으면 안 됩니다" +msgstr "굽기 명령은 비어있으면 안됩니다" #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "CD 재생기 명령이 정의되지 않았습니다" +msgstr "CD 재생기 명령을 정의하지 않았습니다" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" -msgstr "카메라가 감지되었습니다" +msgstr "카메라 감지함" #: ../thunar-volman/tvm-usb-device.c:63 msgid "A photo camera was detected" -msgstr "사진 카메라가 감지되었습니다" +msgstr "사진 카메라를 감지했습니다" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" -msgstr "프린터가 감지되었습니다" +msgstr "프린터 감지함" #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "USB 프린터가 감지되었습니다" +msgstr "USB 프린터를 감지했습니다" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "지원되지 않은 USB 장치 유형" +msgid "Unsupported USB device type \"%s\"" +msgstr "지원하지 않는 USB 장치 형식 \"%s\" 입니다" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Thunar 볼륨 관리자 설정" +msgstr "투나 볼륨 관리자 설정" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "이동식 드라이브와 미디어" @@ -359,36 +356,35 @@ msgid "Shell Scripts" msgstr "쉘 스크립트" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" -msgstr "저장장치" +msgstr "저장 장치" #: ../thunar-volman-settings/tvm-preferences-dialog.c:141 msgid "Removable Storage" -msgstr "이동식 저장장치" +msgstr "이동식 저장 장치" #: ../thunar-volman-settings/tvm-preferences-dialog.c:158 msgid "_Mount removable drives when hot-plugged" -msgstr "연결되면 이동식 드라이브를 마운트 합니다(_M)" +msgstr "연결하면 이동식 드라이브를 마운트(_M)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:166 msgid "Mount removable media when _inserted" -msgstr "삽입되면 이동식 미디어를 마운트합니다(_I)" +msgstr "삽입하면 이동식 미디어를 마운트(_I)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:174 msgid "B_rowse removable media when inserted" -msgstr "삽입되면 이동식 미디어를 탐색합니다(_R)" +msgstr "삽입하면 이동식 미디어를 탐색(_R)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" -msgstr "새 드라이브와 미디어에 있는 자동 실행 프로그램(_A)" +msgstr "새 드라이브와 미디어에 있는 프로그램 자동 실행(_A)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" -msgstr "새 드라이브와 미디어에 있는 자동 열림 파일" +msgstr "새 드라이브와 미디어에 있는 파일 자동 열기" #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" @@ -396,30 +392,29 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" -msgstr "빈 디스크가 삽입되면 CD나 DVD를 굽습니다(_B)" +msgstr "빈 디스크를 삽입하면 CD 또는 DVD 굽기(_B)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" -msgstr "Data CD에 대한 명령(_D):" +msgstr "데이터 CD에 대한 명령(_D):" #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "음악 CD에 대한 명령(_U):" +msgstr "오디오 CD에 대한 명령(_U):" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "멀티미디어" #: ../thunar-volman-settings/tvm-preferences-dialog.c:266 msgid "Audio CDs" -msgstr "음악 CD" +msgstr "오디오 CD" #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "삽입되면 음악 CD를 재생합니다(_A)" +msgstr "삽입하면 오디오 CD를 재생(_A)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -435,7 +430,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:321 msgid "Play _video CDs and DVDs when inserted" -msgstr "삽입되면 동영상 CD와 DVD를 재생합니다(_V)" +msgstr "삽입하면 동영상 CD와 DVD 재생(_V)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:329 #: ../thunar-volman-settings/tvm-preferences-dialog.c:367 @@ -450,11 +445,10 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" -msgstr "연결되면 음악 파일을 재생합니다(_M)" +msgstr "연결하면 음악 파일 재생(_M)" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "카메라" @@ -465,14 +459,13 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "연결되면 디지털 사진을 가져옵니다" +msgstr "연결하면 디지털 사진 가져오기" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" -msgstr "PDA" +msgstr "개인 정보 단말기" #: ../thunar-volman-settings/tvm-preferences-dialog.c:441 msgid "Palm™" @@ -480,19 +473,18 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:458 msgid "Sync _Palm™ devices when connected" -msgstr "연결되면 Palm™ 장치를 동기화 합니다(_P)" +msgstr "연결하면 Palm™ 장치를 동기화(_P)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" -msgstr "Pocket PC" +msgstr "포켓 PC" #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" -msgstr "연결되면 Pocket PC 장치를 동기화 합니다(_C)" +msgstr "연결하면 포켓 PC 장치 동기화(_C)" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -500,14 +492,13 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "프린터가 연결되었을 때 자동으로 프로그램을 실행합니다(_P)" +msgstr "프린터를 연결하면 자동으로 프로그램 실행(_P)" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" -msgstr "입력장치" +msgstr "입력 장치" #: ../thunar-volman-settings/tvm-preferences-dialog.c:576 msgid "Keyboards" @@ -515,7 +506,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "USB 키보드가 연결되었을 때 프로그램을 자동으로 실행합니다(_k)" +msgstr "USB 키보드를 연결하면 자동으로 프로그램 실행(_K)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" @@ -523,7 +514,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 msgid "Automatically run a program when a USB _mouse is connected" -msgstr "USB 마우스가 연결되었을 때 프로그램을 자동으로 실행합니다(_M)" +msgstr "USB 마우스를 연결하면 자동으로 프로그램 실행(_M)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -531,7 +522,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "태블릿이 연결되었을 때 자동으로 프로그램을 실행합니다(_T)" +msgstr "태블릿을 연결하면 자동으로 프로그램 실행(_T)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" @@ -540,4 +531,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "문서 탐색기를 여는데 실패했습니다" - diff -Nru thunar-volman-0.6.1/po/lt.po thunar-volman-0.8.1/po/lt.po --- thunar-volman-0.6.1/po/lt.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/lt.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,30 +1,29 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# Algimantas Margevičius , 2012. -# +# +# Translators: +# Algimantas Margevičius , 2012 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-27 14:24+0000\n" -"PO-Revision-Date: 2012-01-27 18:24+0200\n" -"Last-Translator: Algimantas Margevičius \n" -"Language-Team: Lietuvių <>\n" -"Language: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Lithuanian (http://www.transifex.com/projects/p/xfce/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2)\n" +"Language: lt\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Naujai pridėto įrenginio syfs kelias" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Konfigūruoti išimamų įrenginių tvarkymą" @@ -38,21 +37,21 @@ msgid "Thunar Volume Manager" msgstr "Thunar failų tvarkytuvė" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Visos teisės saugomos." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Apie klaidas praneškite <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Nėra įrenginio su sysfs keliu „%s“" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Turite nurodyti įrenginių sysfs kelią su --device-added" @@ -212,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Nežinomas įrenginio tipas" +msgid "Unknown block device type \"%s\"" +msgstr "" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Įrenginio tipas nepalaikomas" +msgid "Device type \"%s\" not supported" +msgstr "" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -248,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Nepalaikomas įvesties įrenginio tipas" +msgid "Unsupported input device type \"%s\"" +msgstr "" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -316,15 +315,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Nepalaikomas USB įrenginio tipas" +msgid "Unsupported USB device type \"%s\"" +msgstr "" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunar failų tvarkyklės nustatymai" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Išimami diskai ir laikmenos" @@ -357,9 +356,8 @@ msgid "Shell Scripts" msgstr "Shell scenarijai" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Laikmenos" @@ -404,9 +402,8 @@ msgid "Command for A_udio CDs:" msgstr "_Audio CD komanda:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Daugialypė terpė" @@ -450,9 +447,8 @@ msgid "Play _music files when connected" msgstr "Prijungus groti _muzikos failus" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Fotoaparatai" @@ -465,9 +461,8 @@ msgid "Import digital photographs when connected" msgstr "Prijungus importuoti skaitmenines nuotraukas" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA" @@ -488,9 +483,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "_Prijungus sinchronizuoti kišeninius kompiuterius" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -500,9 +494,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Prijungus _spausdintuvą automatiškai vykdyti programą" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Įvesties įrenginiai" diff -Nru thunar-volman-0.6.1/po/lv.po thunar-volman-0.8.1/po/lv.po --- thunar-volman-0.6.1/po/lv.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/lv.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,32 +1,30 @@ -# Latvian translation of thunar-volman. -# Copyright (C) 2007 THE thunar-volman'S COPYRIGHT HOLDER -# This file is distributed under the same license as the hunar-volman package. -# -# Rihards Prieditis , 2007. -# Rihards Prieditis , 2009. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Rihards Priedītis , 2009 +# Rihards Prieditis , 2007 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2009-10-16 15:18+0100\n" -"Last-Translator: Rihards Prieditis \n" -"Language-Team: Latvian \n" -"Language: lv\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Latvian (http://www.transifex.com/projects/p/xfce/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " -"2);\n" +"Language: lv\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" #: ../thunar-volman/main.c:59 -#, fuzzy -msgid "The syfs path of the newly added device" -msgstr "Jaunās pievienotāts ierīces HAL ierīces UDI" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Konfigurēt noņemamo disku un datu nesēju pārvaldību" @@ -40,24 +38,24 @@ msgid "Thunar Volume Manager" msgstr "Thunar sējumu pārvaldnieks" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "" -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Lūdzu ziņojiet pa kļūdām uz<%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "" -#: ../thunar-volman/main.c:186 -#, fuzzy, c-format +#: ../thunar-volman/main.c:188 +#, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "Jānorāda jauns HAL ierīces UDI ar --device-added" +msgstr "" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -65,9 +63,8 @@ msgstr "Foto un mūzika" #: ../thunar-volman/tvm-block-device.c:205 -#, fuzzy msgid "Photos were found on your portable music player" -msgstr "Tika atrastas fotogrāfijas uz portatīvā mūzikas atskaņotāja." +msgstr "" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -98,16 +95,14 @@ msgstr "Fotogrāfiju imports" #: ../thunar-volman/tvm-block-device.c:274 -#, fuzzy msgid "A photo card has been detected" -msgstr "Tika noteikta fotogrāfiju karte" +msgstr "" #: ../thunar-volman/tvm-block-device.c:275 msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Uz kartes ir fotogrāfijas. Vai vēlaties pievienot šīs fotogrāfijas albūmam?" +msgstr "Uz kartes ir fotogrāfijas. Vai vēlaties pievienot šīs fotogrāfijas albūmam?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -196,14 +191,12 @@ msgstr "" #: ../thunar-volman/tvm-block-device.c:824 -#, fuzzy msgid "Audio/Data CD" -msgstr "Audio / Datu CD" +msgstr "" #: ../thunar-volman/tvm-block-device.c:825 -#, fuzzy msgid "The CD in the drive contains both music and files" -msgstr "CD satur gan mūziku, gan failus." +msgstr "" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" @@ -219,49 +212,32 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" +msgid "Unknown block device type \"%s\"" msgstr "" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" +msgid "Device type \"%s\" not supported" msgstr "" -#: ../thunar-volman/tvm-input-device.c:74 -#, fuzzy -msgid "input-keyboard" -msgstr "Klaviatūra" - #: ../thunar-volman/tvm-input-device.c:75 -#, fuzzy msgid "Keyboard detected" -msgstr "Klaviatūra" +msgstr "" #: ../thunar-volman/tvm-input-device.c:76 -#, fuzzy msgid "A keyboard was detected" -msgstr "Tika noteikta fotogrāfiju karte" - -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" msgstr "" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 -#, fuzzy msgid "Tablet detected" -msgstr "Automātiskās palaišanas iespējas noteiktas" +msgstr "" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" msgstr "" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "" @@ -272,7 +248,7 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" +msgid "Unsupported input device type \"%s\"" msgstr "" #: ../thunar-volman/tvm-run.c:171 @@ -285,9 +261,8 @@ msgstr "" #: ../thunar-volman/tvm-run.c:190 -#, fuzzy msgid "You have inserted a blank DVD." -msgstr "Jūs esat ievietojis tukšu disku." +msgstr "" #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -298,24 +273,20 @@ msgstr "" #: ../thunar-volman/tvm-run.c:200 -#, fuzzy msgid "Blank CD inserted" -msgstr "Tukši CD un DVD" +msgstr "" #: ../thunar-volman/tvm-run.c:201 -#, fuzzy msgid "You have inserted a blank CD." -msgstr "Jūs esat ievietojis tukšu disku." +msgstr "" #: ../thunar-volman/tvm-run.c:204 -#, fuzzy msgid "Burn _Data CD" -msgstr "Veidot _Datu CD" +msgstr "" #: ../thunar-volman/tvm-run.c:205 -#, fuzzy msgid "Burn _Audio CD" -msgstr "Veidot _Audio CD" +msgstr "" #: ../thunar-volman/tvm-run.c:229 #, c-format @@ -332,9 +303,8 @@ msgstr "" #: ../thunar-volman/tvm-usb-device.c:63 -#, fuzzy msgid "A photo camera was detected" -msgstr "Tika noteikta fotogrāfiju karte" +msgstr "" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" @@ -346,16 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" +msgid "Unsupported USB device type \"%s\"" msgstr "" #. setup application name #: ../thunar-volman-settings/main.c:52 -#, fuzzy msgid "Thunar Volume Manager Settings" -msgstr "Thunar sējumu pārvaldnieks" +msgstr "" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Noņemamie diski un datu nesēji" @@ -388,9 +357,8 @@ msgid "Shell Scripts" msgstr "Čaukas skripti" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Datu nesēji" @@ -435,9 +403,8 @@ msgid "Command for A_udio CDs:" msgstr "Komanda priekš A_udio CD:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimēdia" @@ -481,9 +448,8 @@ msgid "Play _music files when connected" msgstr "Atskaņot _mūzikas failus, kad pievienots" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Kameras" @@ -496,9 +462,8 @@ msgid "Import digital photographs when connected" msgstr "Importēt digitālās fotogrāfijas, kad pievienots" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "Personālie ciparasistenti" @@ -519,9 +484,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Sinhronizēt plaukstdatoru, kad pievienots" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -531,9 +495,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Automātiski palaist programu, kad p_rinteris ir pievienots" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Ievad ierīces" @@ -543,18 +506,16 @@ msgstr "Klaviatūra" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "Automātiski palaist programu, kad USB _klaviatūra ir pievienota" +msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Pele" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" -msgstr "Automātiski palaist programu, kad USB _pele ir pievienota" +msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -571,57 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Neizdevas atvērt dokumentu pārlūku" - -#~ msgid "Failed to open display" -#~ msgstr "Neizdevās atvērt displeju" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Thunar izstrādes komanda. Visas tiesības rezervētas." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Autors Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Norādītais UDI \"%s\" nav derīgs HAL ierīces UDI" - -#~ msgid "Encrypted volume" -#~ msgstr "Šifrēts sējums" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Šifrēta sējuma montēšana..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "crypto slāņa uzstādīšana..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Jums nav tiesību uzstādīt crypto slāni" - -#~ msgid "Wrong password" -#~ msgstr "Nepareiza parole" - -#~ msgid "Wrong password." -#~ msgstr "Nepareiza parole." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "Šis sējums ir šifrēts." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Lūdzu ievadiet savu paroli, lai atšifrētu un nomontētu sējumu." - -#~ msgid "_Mount" -#~ msgstr "_Montēt" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Neizdevās uzstādīt šifrēšanas sējumu" - -#~ msgid "Choose Disc Type" -#~ msgstr "Norādiet diska tipu" - -#~ msgid "Make _DVD" -#~ msgstr "Veidot _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Noņemamās iekārtas" diff -Nru thunar-volman-0.6.1/po/Makefile.in.in thunar-volman-0.8.1/po/Makefile.in.in --- thunar-volman-0.6.1/po/Makefile.in.in 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/Makefile.in.in 2015-02-28 17:59:06.000000000 +0000 @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -109,7 +108,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -143,8 +142,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff -Nru thunar-volman-0.6.1/po/ms.po thunar-volman-0.8.1/po/ms.po --- thunar-volman-0.6.1/po/ms.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/ms.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,533 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Puretech , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-14 09:27+0000\n" +"Last-Translator: Puretech \n" +"Language-Team: Malay (http://www.transifex.com/projects/p/xfce/language/ms/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ms\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "Laluan sysfs peranti baharu ditambah" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "Pengurus konfigurasi bagi peranti boleh tanggal dan media" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "Papar maklumat versi dan keluar" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "Pengurus Volum Thunar" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "Semua hak cipta terpelihara." + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Sila laporkan pepijat ke <%s>." + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "Tiada peranti dengan laluan sysfs \"%s\"" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "Mesti nyatakan laluan sysfs peranti baharu dengan --device-added" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "Foto dan Muzik" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "Foto telah dijumpai pada pemain muzik mudah alih anda" + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "Adakah anda mahu mengimport foto atau menguruskan muzik?" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "Abaikan" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "Import Foto" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "Uruskan _Muzik" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "Import Foto" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "Kad foto telah dikesan" + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "Terdapat foto didalam kad. Anda mahu tambahkan foto ini ke album anda?" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "Anda mahu benarkan \"%s\" dijalankan?" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "Pengesahan Auto-Jalan" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "Keupayaan Auto-Jalan dikesan" + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "Benarkan Auto-Jalan" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "Adakah anda mahu buka \"%s\"?" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "Pengesahan Auto-Buka" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "Keupayaan Auto-Buka dikesan" + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "_Buka" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "CD dilekap" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "DVD dilekap" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "CD dilekap secara automatik" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "DVD dilekap secara automatik" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "Volum dilekap" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "Volum \"%s\" telah dilekap secara automatik" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "Volum yang dimasukkkan telah dilekap secara automatik" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "Tidak dapat mencari titik lekap" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "Tidak dapat melekapkan peranti" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "Tidak dapat mengesan volum berkaitan dengan peranti" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "CD Audio/Data" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "CD di dalam peranti mengandungi kedua-dua music dan fail" + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "Adakah anda mahu mendengar muzik atau melungsuri fail?" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "Lungsuri Fail" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "Main CD" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "Blok peranti tidak diketahui jenis \"%s\"" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "Peranti jenis \"%s\" tidak disokong" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "Papan kekunci dikesan" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "Papan kekunci telah dikesan" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "Tablet dikesan" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "Tablet grafik telah dikesan" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "Tetikus dikesan" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "Tetikus telah dikesan" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "Peranti input tidak disokong jenis \"%s\"" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "Auto-bakar CD dan DVD kosong dilumpuhkan" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "DVD kosong dimasukkan" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "Anda telah memasukkan DVD kosong." + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "Apa yang anda ingin lakukan?" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "Bakar _DVD" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "CD kosong dimasukkan" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "Anda telah memasukkan CD kosong." + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "Bakar CD _Data" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "Bakar CD _Audio" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "Arahan pembakaran tidak boleh kosong" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "Arahan pemain CD tidak dinyatakan" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "Kamera dikesan" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "Kamera foto telah dikesan" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "Pencetak dikesan" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "Pencetak USB telah dikesan" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "Peranti USB tidak disokong jenis \"%s\"" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "Tetapan Pengurus Volum Thunar" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "Pemacu dan Media Boleh Alih" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "Pilih Aplikasi" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "Semua Fail" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "Fail Boleh Laksana" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "Skrip Perl" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "Skrip Python" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "Skrip Ruby" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "Skrip Shell" + +#. Storage +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "Storan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "Storan boleh tanggal" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "_Lekap pemacu bolehtanggal bile dihot-plug" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "Lekap media bolehtanggal bila dimasukkan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "Lungsuri media _bolehtanggal bila dimasukkan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "_Auto-laksana program pada pemacu dan media baharu" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "_Auto-buka fail pada pemacu dan media baharu" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "CD dan DVD Kosong" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "Bakar CD atau DVD apabila cakera kosong dimasukkkan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "Arahan untuk CD Data:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "Arahan untuk CD Audio:" + +#. Multimedia +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "Multimedia" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "CD Audio" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "Main CD audio bila dimasukkan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "Arahan:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "CD/DVD Video" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "Mainkan CD dan DVD video apabila dimasukkan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "Arahan:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "Peranti Muzik Mudah Alih" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "Main fail muzik apabila disambung" + +#. Cameras +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "Kamera" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "Kamera Digital" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "Import foto digital apabila disambung" + +#. PDAs +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "PDAs" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "Segerakkan peranti Palm™ apabila disambung" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "PCs Poket" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "Segerakkan peranti PC Poket apabila disambung" + +#. Printers +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "Pencetak" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "Jalankan program secara automatik apabila pencetak disambungkan" + +#. Input Devices +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "Peranti Input" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "Papan kekunci" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "Jalankan program secara automatik apabila papan kekunci USB disambungkan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "Tetikus" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Jalankan program secara automatik apabila tetikus USB disambungkan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "Tablet" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "Jalankan program secara automatik apabila tablet disambungkan" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "Arahan:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "Gagal membuka pelayar dokumentasi" diff -Nru thunar-volman-0.6.1/po/nb.po thunar-volman-0.8.1/po/nb.po --- thunar-volman-0.6.1/po/nb.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/nb.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,30 +1,32 @@ -# Norwegian Bokmal translations for thunar-volman package. -# Copyright (C) 2007 THE thunar-volman'S COPYRIGHT HOLDER -# This file is distributed under the same license as the thunar-volman package. -# Terje Uriansrud , 2007. -# Terje Uriansrud , 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# kingu , 2014 +# haarek , 2014 +# Terje Uriansrud , 2009 +# Terje Uriansrud , 2007 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2007-07-01 20:42+0200\n" -"Last-Translator: Terje Uriansrud \n" -"Language-Team: Norwegian Bokmal\n" -"Language: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-05-10 15:47+0000\n" +"Last-Translator: kingu \n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/thunar-volman/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -#, fuzzy -msgid "The syfs path of the newly added device" -msgstr "HAL enhetens UDI for enheten som er lagt til" +msgid "The sysfs path of the newly added device" +msgstr "Sysfs-sti til nylig tilknyttet enhet" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Konfigurer oppsett for avmonterbare stasjoner og media" @@ -38,24 +40,24 @@ msgid "Thunar Volume Manager" msgstr "Thunar enhetsbehandler" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." -msgstr "" +msgstr "Alle rettigheter reservert." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapporter feil til <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "" +msgstr "Det finnes ingen enhet med sysfs-sti \"%s\"" -#: ../thunar-volman/main.c:186 -#, fuzzy, c-format +#: ../thunar-volman/main.c:188 +#, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "Spesifisering av ny HAL enhet UDI må spesifiseres med --device-added" +msgstr "Sysfs-sti må spesifiseres for nye enheter med --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -63,13 +65,12 @@ msgstr "Bilder og musikk" #: ../thunar-volman/tvm-block-device.c:205 -#, fuzzy msgid "Photos were found on your portable music player" -msgstr "Bilder er funnet på din portable musikkavspiller." +msgstr "Det ble funnet bilder på din bærbare musikkenhet" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" -msgstr "Ønsker du å importere bildene eller vedlikeholde musikk?" +msgstr "Ønsker du å importere bildene eller behandle musikken?" #: ../thunar-volman/tvm-block-device.c:208 #: ../thunar-volman/tvm-block-device.c:277 @@ -88,7 +89,7 @@ #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" -msgstr "Vedlikehold _musikk" +msgstr "Behandle _musikk" #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 @@ -96,7 +97,6 @@ msgstr "Bildeimport" #: ../thunar-volman/tvm-block-device.c:274 -#, fuzzy msgid "A photo card has been detected" msgstr "Et bildekort ble funnet." @@ -104,9 +104,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Det finnes bilder på kortet. Ønsker du å legge til disse bildene ialbumet " -"ditt?" +msgstr "Det finnes bilder på kortet. Ønsker du å legge til disse bildene i albumet ditt?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -114,7 +112,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "Ønsker du å tillate \"%s\" å starte?" +msgstr "Ønsker du å tillate «%s» å starte?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -135,7 +133,7 @@ #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "Ønsker du å åpne \"%s\"?" +msgstr "Ønsker du å åpne «%s»?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" @@ -151,66 +149,64 @@ #: ../thunar-volman/tvm-block-device.c:619 msgid "CD mounted" -msgstr "" +msgstr "CD montert" #: ../thunar-volman/tvm-block-device.c:619 msgid "DVD mounted" -msgstr "" +msgstr "DVD montert" #: ../thunar-volman/tvm-block-device.c:621 msgid "The CD was mounted automatically" -msgstr "" +msgstr "CD-en ble montert automatisk" #: ../thunar-volman/tvm-block-device.c:622 msgid "The DVD was mounted automatically" -msgstr "" +msgstr "DVD-en ble montert automatisk" #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "" +msgstr "Volum montert" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "" +msgstr "Volumet «%s» ble montert automatisk" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "" +msgstr "Det tilknyttede volumet ble montert automatisk" #: ../thunar-volman/tvm-block-device.c:694 #, c-format msgid "Unable to locate mount point" -msgstr "" +msgstr "Finner ikke monteringspunkt" #: ../thunar-volman/tvm-block-device.c:740 #, c-format msgid "Unable to mount the device" -msgstr "" +msgstr "Kan ikke montere enheten" #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "" +msgstr "Kunne ikke finne volumet som samsvarer med enheten" #: ../thunar-volman/tvm-block-device.c:824 -#, fuzzy msgid "Audio/Data CD" -msgstr "Lyd/data CD" +msgstr "Lyd/Data-CD" #: ../thunar-volman/tvm-block-device.c:825 -#, fuzzy msgid "The CD in the drive contains both music and files" -msgstr "CD'en i enheten inneholder både musikk og filer." +msgstr "CD-en i stasjonen inneholder både musikk og datafiler" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "Ønsker du å høre på musikken eller navigere filene?" +msgstr "Ønsker du å høre på musikk eller å bla gjennom filene?" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" -msgstr "_Navigerer filer" +msgstr "_Bla gjennom filer" #: ../thunar-volman/tvm-block-device.c:831 msgid "_Play CD" @@ -218,75 +214,57 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "" +msgid "Unknown block device type \"%s\"" +msgstr "Ukjent blokkenhetstype \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "" - -#: ../thunar-volman/tvm-input-device.c:74 -#, fuzzy -msgid "input-keyboard" -msgstr "Tastatur" +msgid "Device type \"%s\" not supported" +msgstr "Enhetstypen «%s» støttes ikke" #: ../thunar-volman/tvm-input-device.c:75 -#, fuzzy msgid "Keyboard detected" -msgstr "Tastatur" +msgstr "Tastatur oppdaget" #: ../thunar-volman/tvm-input-device.c:76 -#, fuzzy msgid "A keyboard was detected" -msgstr "Et bildekort ble funnet." - -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "" +msgstr "Et tastatur ble oppdaget" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 -#, fuzzy msgid "Tablet detected" -msgstr "Automatisk kjøreegenskap funnet" +msgstr "Nettbrett oppdaget" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "" - -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" +msgstr "Et grafisk tegnebrett ble oppdaget" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" -msgstr "" +msgstr "Datamus oppdaget" #: ../thunar-volman/tvm-input-device.c:112 msgid "A mouse was detected" -msgstr "" +msgstr "En datamus ble oppdaget" #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "" +msgid "Unsupported input device type \"%s\"" +msgstr "Inngangenhetstypen «%s» støttes ikke" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "" +msgstr "Automatisk brenning av tomme CDer og DVDer er deaktivert" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" -msgstr "" +msgstr "Tom DVD satt inn" #: ../thunar-volman/tvm-run.c:190 -#, fuzzy msgid "You have inserted a blank DVD." -msgstr "Du har satt inn en tom plate." +msgstr "Du har satt inn en tom DVD." #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -294,67 +272,61 @@ #: ../thunar-volman/tvm-run.c:193 msgid "Burn _DVD" -msgstr "" +msgstr "Brenn _DVD" #: ../thunar-volman/tvm-run.c:200 -#, fuzzy msgid "Blank CD inserted" -msgstr "Blanke CD'er og DVD'er" +msgstr "Tom CD satt inn" #: ../thunar-volman/tvm-run.c:201 -#, fuzzy msgid "You have inserted a blank CD." -msgstr "Du har satt inn en tom plate." +msgstr "Du har satt inn en tom CD." #: ../thunar-volman/tvm-run.c:204 -#, fuzzy msgid "Burn _Data CD" -msgstr "Lag en _datacd" +msgstr "Brenn _Data-CD" #: ../thunar-volman/tvm-run.c:205 -#, fuzzy msgid "Burn _Audio CD" -msgstr "Lag en _lydcd" +msgstr "Brenn _Lyd-CD" #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "" +msgstr "Brennekommandoen kan ikke være tom" #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "" +msgstr "CD-spillerens kommando er udefinert" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" -msgstr "" +msgstr "Kamera oppdaget" #: ../thunar-volman/tvm-usb-device.c:63 -#, fuzzy msgid "A photo camera was detected" -msgstr "Et bildekort ble funnet." +msgstr "Et fotokamera ble oppdaget" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" -msgstr "" +msgstr "Skriver oppdaget" #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "" +msgstr "En USB-skriver ble oppdaget" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "" +msgid "Unsupported USB device type \"%s\"" +msgstr "USB-enhetstypen «%s» støttes ikke" #. setup application name #: ../thunar-volman-settings/main.c:52 -#, fuzzy msgid "Thunar Volume Manager Settings" -msgstr "Thunar enhetsbehandler" +msgstr "Innstillinger for volumhåndtering i Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Avmonterbare Enheter og media" @@ -387,9 +359,7 @@ msgid "Shell Scripts" msgstr "Skallskript" -#. #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Lagring" @@ -408,7 +378,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:174 msgid "B_rowse removable media when inserted" -msgstr "_Naviger flyttbare medier når de settes inn" +msgstr "_Bla gjennom flyttbare medier når de settes inn" #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" @@ -420,7 +390,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" -msgstr "Blanke CD'er og DVD'er" +msgstr "Tomme CD-er og DVD-er" #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" @@ -428,22 +398,20 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" -msgstr "Kommando for _data CD'er:" +msgstr "Kommando for _datacd-er:" #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "Kommando for _lydcd'er:" +msgstr "Kommando for _lydcd-er:" -#. #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" #: ../thunar-volman-settings/tvm-preferences-dialog.c:266 msgid "Audio CDs" -msgstr "Lydcd'er" +msgstr "Lydcd-er" #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" @@ -459,11 +427,11 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:304 msgid "Video CDs/DVDs" -msgstr "Video CD'er/DVD'er" +msgstr "Video CD-er/DVD-er" #: ../thunar-volman-settings/tvm-preferences-dialog.c:321 msgid "Play _video CDs and DVDs when inserted" -msgstr "Spill _video CD'er og DVD'er når de settes inn" +msgstr "Spill _video CD-er og DVD-er når de settes inn" #: ../thunar-volman-settings/tvm-preferences-dialog.c:329 #: ../thunar-volman-settings/tvm-preferences-dialog.c:367 @@ -474,18 +442,16 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:343 msgid "Portable Music Players" -msgstr "Portable musikkspillere" +msgstr "Bærbare musikkspillere" #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" msgstr "Spill _musikkfiler ved tilkobling" -#. #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" -msgstr "Kamera" +msgstr "Kameraer" #: ../thunar-volman-settings/tvm-preferences-dialog.c:390 msgid "Digital Cameras" @@ -495,12 +461,10 @@ msgid "Import digital photographs when connected" msgstr "Importer digitale bilder ved tilkobling" -#. #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" -msgstr "PDA'er" +msgstr "PDA-er" #: ../thunar-volman-settings/tvm-preferences-dialog.c:441 msgid "Palm™" @@ -508,19 +472,17 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:458 msgid "Sync _Palm™ devices when connected" -msgstr "Synkroniser _Palm enheter hvis tilkoblet" +msgstr "Synkroniser _Palm-enheter hvis tilkoblet" #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" -msgstr "Pocket PC'er" +msgstr "Pocket PC-er" #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" -msgstr "Synkronser Pocket P_C enheter ved tilkobling" +msgstr "Synkronser Pocket P_C-enheter ved tilkobling" -#. #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -530,30 +492,26 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Kjør et program automatisk når en _skriver kobles til" -#. #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" -msgstr "Innenheter" +msgstr "Inngangsenheter" #: ../thunar-volman-settings/tvm-preferences-dialog.c:576 msgid "Keyboards" -msgstr "Tastatur" +msgstr "Tastaturer" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "Kjør et program automatisk når et USB _tastatur kobles til" +msgstr "Automatisk kjør et program når et USB-tastatur kobles til" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Mus" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" -msgstr "Kjør et program automatisk når en USB _mus kobles til" +msgstr "Automatisk kjør et program når en USB-mus kobles til." #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -570,60 +528,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Klarte ikke åpne dokumentasjonsnavigatoren" - -#~ msgid "Failed to open display" -#~ msgstr "Klarte ikke åpne skjerm" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Thunar utvikliingsteam. Alle rettigheter reservert." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Skrevet av Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Den spesifiserte UDI \"%s\" er ikke en gyldig HAL enhets UDI" - -#~ msgid "Encrypted volume" -#~ msgstr "Kryptert dataområde" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Monterer kryptert dataområde..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Setter opp kryptografilag..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Du har ikke rettigheter til å sette opp kryptografilaget" - -#~ msgid "Wrong password" -#~ msgstr "Feil passord" - -#~ msgid "Wrong password." -#~ msgstr "Feil passord." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Dette dataområdet er kryptert." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Skriv inn passordet for å dekryptere og montere dataområdet." - -#~ msgid "_Mount" -#~ msgstr "_Monter" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Klarte ikke sette opp det krypterte dataområdet" - -#~ msgid "Choose Disc Type" -#~ msgstr "Velg disktype" - -#~ msgid "Make _DVD" -#~ msgstr "Lag _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Avmonterbare media" diff -Nru thunar-volman-0.6.1/po/nl.po thunar-volman-0.8.1/po/nl.po --- thunar-volman-0.6.1/po/nl.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/nl.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,32 +1,33 @@ -# Dutch translation for the thunar-volman package. -# Copyright (C) The Xfce development team. -# This file is distributed under the same license as the thunar-volman package. -# Remco den Breeje, 2007. -# Pjotr, 2011. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Pjotr123 , 2013 +# Remco den Breeje, 2007 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-15 15:30+0000\n" -"PO-Revision-Date: 2011-09-08 14:06+0200\n" -"Last-Translator: Pjotr\n" -"Language-Team: Dutch (Flemish)\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-22 09:02+0000\n" +"Last-Translator: Pjotr123 \n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/xfce/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl (Dutch)\n" +"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "Het sysfs-pad van het zojuist toegevoegde apparaat" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "Beheer van verwijderbare stations en media instellen" +msgstr "Beheer van verwijderbare stations en opslagmedia instellen" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" @@ -35,27 +36,26 @@ #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Thunar Mediumbeheerder" +msgstr "Thunar opslagmediumbeheerder" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Alle rechten voorbehouden." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Fouten graag melden aan <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "Er is geen apparaat met het sysfs-pad \"%s\"" +msgstr "Er is geen apparaat met het sysfs-pad '%s'" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"Moet het sysfs-pad van nieuwe apparaten specificeren met --device-added" +msgstr "Moet het sysfs-pad van nieuwe apparaten specificeren met --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -102,9 +102,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Op dit kaartje zijn foto's gevonden. Wilt u deze foto's toevoegen aan uw " -"album?" +msgstr "Op dit kaartje zijn foto's gevonden. Wilt u deze foto's toevoegen aan uw album?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -112,7 +110,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "Wilt u \"%s\" toestaan om te draaien?" +msgstr "Wilt u '%s' toestaan om te draaien?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -133,7 +131,7 @@ #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "Wilt u \"%s\" openen?" +msgstr "Wilt u '%s' openen?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" @@ -165,17 +163,17 @@ #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "Medium aangekoppeld" +msgstr "Opslagmedium aangekoppeld" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "Het medium \"%s\" werd automatisch aangekoppeld" +msgstr "Het opslagmedium '%s' werd automatisch aangekoppeld" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "Het erin gestopte medium werd automatisch aangekoppeld" +msgstr "Het ingebrachte opslagmedium werd automatisch aangekoppeld" #: ../thunar-volman/tvm-block-device.c:694 #, c-format @@ -190,11 +188,11 @@ #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "Kon het medium niet vinden dat met het apparaat overeenkomt" +msgstr "Kon het opslagmedium niet vinden dat met het apparaat overeenkomt" #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "Geluid-/Gegevens-CD" +msgstr "Geluid-/gegevens-CD" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" @@ -210,17 +208,17 @@ #: ../thunar-volman/tvm-block-device.c:831 msgid "_Play CD" -msgstr "_Muziek beluisteren" +msgstr "CD _afspelen" #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Onbekend type blokapparaat" +msgid "Unknown block device type \"%s\"" +msgstr "Onbekend type blokapparaat '%s'" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Apparaattype niet ondersteund" +msgid "Device type \"%s\" not supported" +msgstr "Apparaattype '%s' niet ondersteund" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -228,7 +226,7 @@ #: ../thunar-volman/tvm-input-device.c:76 msgid "A keyboard was detected" -msgstr "Een toetsenbord werd aangetroffen" +msgstr "Er werd een toetsenbord aangetroffen" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 @@ -238,7 +236,7 @@ #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "Er is een tekentablet gevonden" +msgstr "Er werd een tekentablet gevonden" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" @@ -250,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Niet-ondersteund type invoerapparaat" +msgid "Unsupported input device type \"%s\"" +msgstr "Niet-ondersteund type invoerapparaat '%s'" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -306,7 +304,7 @@ #: ../thunar-volman/tvm-usb-device.c:63 msgid "A photo camera was detected" -msgstr "Er is een fotocamera gevonden" +msgstr "Er werd een fotocamera gevonden" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" @@ -314,22 +312,22 @@ #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "Er is een USB-printer gevonden" +msgstr "Er werd een USB-printer gevonden" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Niet-ondersteund type USB-apparaat" +msgid "Unsupported USB device type \"%s\"" +msgstr "Niet-ondersteund type USB-apparaat '%s'" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Instellingen voor Thunar Mediumbeheerder" +msgstr "Instellingen voor Thunar Opslagmediumbeheerder" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" -msgstr "Verwijderbare stations en media" +msgstr "Verwijderbare stations en opslagmedia" #: ../thunar-volman-settings/tvm-command-entry.c:240 msgid "Select an Application" @@ -345,19 +343,19 @@ #: ../thunar-volman-settings/tvm-command-entry.c:270 msgid "Perl Scripts" -msgstr "Perl scripts" +msgstr "Perl-scripts" #: ../thunar-volman-settings/tvm-command-entry.c:276 msgid "Python Scripts" -msgstr "Python scripts" +msgstr "Python-scripts" #: ../thunar-volman-settings/tvm-command-entry.c:282 msgid "Ruby Scripts" -msgstr "Ruby scripts" +msgstr "Ruby-scripts" #: ../thunar-volman-settings/tvm-command-entry.c:288 msgid "Shell Scripts" -msgstr "Shell scripts" +msgstr "Shell-scripts" #. Storage #. @@ -375,19 +373,19 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:166 msgid "Mount removable media when _inserted" -msgstr "Koppel verwijderbare _media aan wanneer deze worden ingebracht" +msgstr "Koppel verwijderbare opslagmedia aan wanneer deze worden ingebracht" #: ../thunar-volman-settings/tvm-preferences-dialog.c:174 msgid "B_rowse removable media when inserted" -msgstr "_Doorzoek verwijderbare media wanneer deze worden ingebracht" +msgstr "_Doorzoek verwijderbare opslagmedia wanneer deze worden ingebracht" #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" -msgstr "Programma's automatisch _starten op nieuwe stations en media" +msgstr "_Start programma's automatisch op nieuwe stations en opslagmedia" #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" -msgstr "Bestanden automatisch openen op nieuwe stations en media" +msgstr "Open bestanden automatisch op nieuwe stations en opslagmedia" #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" @@ -448,7 +446,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" -msgstr "_Muziekbestanden afspelen wanneer verbonden" +msgstr "Speel _muziekbestanden af wanneer verbonden" #. Cameras #. @@ -462,7 +460,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "Foto's importeren wanneer aangesloten" +msgstr "Importeer digitale foto's wanneer aangesloten" #. PDAs #. @@ -476,7 +474,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:458 msgid "Sync _Palm™ devices when connected" -msgstr "_Palm™ apparaat synchroniseren wanneer aangesloten" +msgstr "Synchroniseer _Palm™-apparaten wanneer aangesloten" #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" @@ -484,7 +482,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" -msgstr "Pocket-P_C-apparaten synchroniseren wanneer aangesloten" +msgstr "Synchroniseer Pocket-P_C-apparaten wanneer aangesloten" #. Printers #. @@ -495,8 +493,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "" -"Een programma automatisch uitvoeren wanneer er een _printer wordt aangesloten" +msgstr "Automatisch een programma uitvoeren wanneer er een _printer wordt aangesloten" #. Input Devices #. @@ -510,9 +507,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "" -"Automatisch een programma uitvoeren wanneer er een USB-_toetsenbord wordt " -"aangesloten" +msgstr "Automatisch een programma uitvoeren wanneer er een USB-_toetsenbord wordt aangesloten" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" @@ -520,9 +515,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 msgid "Automatically run a program when a USB _mouse is connected" -msgstr "" -"Automatisch een programma uitvoeren wanneer er een USB-_muis wordt " -"aangesloten" +msgstr "Automatisch een programma uitvoeren wanneer er een USB-_muis wordt aangesloten" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -530,9 +523,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "" -"Een programma automatisch uitvoeren wanneer er een _tablet-PC wordt " -"aangesloten" +msgstr "Automatisch een programma uitvoeren wanneer er een _tablet-PC wordt aangesloten" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" @@ -540,71 +531,4 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" -msgstr "Kon de documentatieverkenner niet openen" - -#~ msgid "input-keyboard" -#~ msgstr "invoer-toetsenbord" - -#~ msgid "input-tablet" -#~ msgstr "invoer-tablet" - -#~ msgid "input-mouse" -#~ msgstr "invoermuis" - -#~ msgid "Failed to open display" -#~ msgstr "Kon scherm niet openen" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "De Thunar-ontwikkelploeg. Alle rechten voorbehouden" - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Geschreven door Benedikt Meurer " - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "De opgegeven UDI \"%s\" is geen correcte UDI voor een HAL-apparaat" - -#~ msgid "Encrypted volume" -#~ msgstr "Versleuteld medium" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Bezig met aankoppelen van " -#~ "versleuteld medium..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Initialisatie cryptografische laag..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "" -#~ "U hebt geen rechten voor het initialiseren van de cryptografische laag" - -#~ msgid "Wrong password" -#~ msgstr "Fout wachtwoord" - -#~ msgid "Wrong password." -#~ msgstr "Fout wachtwoord." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Dit medium is versleuteld." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Geef uw wachtwoord in, om het medium aan te koppelen en te ontsleutelen." - -#~ msgid "_Mount" -#~ msgstr "_Aankoppelen" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Fout bij initialiseren van het versleutelde medium" - -#~ msgid "Choose Disc Type" -#~ msgstr "Kies schijftype" - -#~ msgid "Make _DVD" -#~ msgstr "Een _DVD maken" - -#~ msgid "Removable Media" -#~ msgstr "Verwijderbare media" +msgstr "Kon de documentatiebladeraar niet openen" diff -Nru thunar-volman-0.6.1/po/nn.po thunar-volman-0.8.1/po/nn.po --- thunar-volman-0.6.1/po/nn.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/nn.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,29 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. # +# Translators: msgid "" msgstr "" "Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-23 17:36+0000\n" -"PO-Revision-Date: 2012-01-07 01:16+0100\n" -"Last-Translator: Eivind Ødegård \n" -"Language-Team: nn \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/xfce/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" -"X-Poedit-Language: Norwegian Nynorsk\n" -"X-Poedit-Country: NORWAY\n" +"Language: nn\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Sysfs-stigen til den nyst tillagde eininga" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Set opp korleis flyttbare stasjonar og lagringsmedium skal handterast" @@ -37,21 +36,21 @@ msgid "Thunar Volume Manager" msgstr "Thunar lagringshandsaming" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Alle rettar atterhaldne." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapporter feil til <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Det finst inga eining med sysfs-stigen «%s»" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Må nemna sysfs-stigen til nye einingar med --device-added" @@ -211,13 +210,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Ukjent blokkeiningstype" +msgid "Unknown block device type \"%s\"" +msgstr "" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Støttar ikkje denne einingstypen" +msgid "Device type \"%s\" not supported" +msgstr "" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -247,8 +246,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Inn-eininga er ikkje støtta" +msgid "Unsupported input device type \"%s\"" +msgstr "" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -315,15 +314,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "USB-eininga er ikkje støtta" +msgid "Unsupported USB device type \"%s\"" +msgstr "" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Set opp Thunar lagringshandsaming" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Flyttbare stasjonar og einingar" @@ -531,12 +530,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Klarte ikkje opna dokumentasjonsvisaren" - -#~ msgid "input-keyboard" -#~ msgstr "inngangstastatur" - -#~ msgid "input-tablet" -#~ msgstr "inngangsbrett" - -#~ msgid "input-mouse" -#~ msgstr "inngangsmus" diff -Nru thunar-volman-0.6.1/po/oc.po thunar-volman-0.8.1/po/oc.po --- thunar-volman-0.6.1/po/oc.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/oc.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,533 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Cedric31 , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-18 13:18+0000\n" +"Last-Translator: Cedric31 \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/xfce/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "Lo camin sysfs del periferic novèlament apondut" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "Configurar la gestion dels disques amovibles e dels mèdias" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "Afichar la version e quitar" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "Gestionari de volum Thunar" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "Totes los dreches reservats." + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Se vos plai raportar los bugs a <%s>." + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "I a pas de periferic correspondent al camin sysfs « %s »" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "Especificar lo camin sysfs dels novèls periferics amb l'opcion --device-added" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "Fòtos e musica" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "De fòtos son estadas trobadas sus vòstre lector de musica portable." + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "Volètz importar las fòtos o gerir la musica ?" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "Ig_norar" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "Importar las _Fòtos" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "Gerir la _musica" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "Importar de fòtos" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "Una carta memòria es estada detectada." + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "De fòtos se tròban sus la carta. Las volètz apondre a vòstre album ?" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "Permetètz l'execucion de « %s » ?" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "Confirmacion d'autoexecucion" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "Possibilitat d'autoexecucion detectada" + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "_Permetre l'autoexecucion" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "Volètz dobrir « %s » ?" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "Confirmacion d'autodobertura" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "Possibilitat d'autodobertura detectada" + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "_Dobrir" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "CD montat" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "DVD montat" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "Lo CD es estat montat automaticament" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "Lo DVD es estat montat automaticament" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "Volum montat" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "Lo volum « %s » es estat montat automaticament" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "Lo volum inserit es estat montat automaticament" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "Impossible de localizar lo punt de montatge" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "Impossible de montar lo periferic" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "Pòt pas detectar lo volum correspondent al periferic" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "CD àudio/Donadas" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "Lo CD dins lo lector conten de musica e de fichièrs" + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "Volètz escotar la musica o percórrer los fichièrs ?" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "_Percórrer los fichièrs" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "_Escotar lo CD" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "Tipe de periferic blòt desconegut « %s »" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "Tipe de periferic « %s » pas suportat" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "Clavièr detectat" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "Un clavièr es estat detectat" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "Tableta detectada" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "Una tableta grafica es estada detectada" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "Mirga detectada" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "Una mirga es estada detectada" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "Periferic d'entrada pas suportat « %s »" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "La gravadura automatica dels CD e DVD vèrges es estada desactivada" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "Un DVD vèrge es estat inserit" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "Avètz inserit un DVD vèrge." + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "De qué volètz far ?" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "Gravar lo _DVD" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "Un CD vèrge es estat inserit" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "Avètz inserit un CD vèrge." + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "Crear un CD de donadas" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "Crear un CD _àudio" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "La comanda de gravadura pòt pas èsser voida" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "La comanda del lector de CD es pas definida" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "Aparelh fòto detectat" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "Un aparelh fòto es estat detectat" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "Imprimenta detectada" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "Una imprimenta USB es estada detectada" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "Tipe de periferic USB pas suportat « %s »" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "Proprietats del gestionari de volums Thunar" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "Disques amovibles e mèdias" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "Seleccionar una aplicacion" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "Totes los fichièrs" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "Fichièrs executables" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "Escripts Perl" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "Escripts Python" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "Escripts Ruby" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "Escripts Shell" + +#. Storage +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "Emmagazinatge" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "Emmagazinatge amovible" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "_Montar los disques amovibles a la connexion" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "Montar los mèdias amovibles a l'_insercion" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "_Percórrer los mèdias amovibles a l'insercion" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "_Autoexecucion d'aplicacions pels novèls disques e mèdias" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "Autodobertura dels fichièrs pels novèls disques e mèdias" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "CD e DVD vèrges" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "_Gravar un CD o DVD a l'insercion d'un disc vèrge" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "Comanda pels CD de _donadas :" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "Comanda pels CD à_udio :" + +#. Multimedia +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "Multimèdia" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "CD àudio" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "Escotar los CD _àudio a l'insercion" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "_Comanda :" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "CD/DVD vidèo" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "Visionar los CD e DVD vidèo a l'insercion" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "C_omanda :" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "Lectors de musica portables" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "Escotar la _musica a la connexion" + +#. Cameras +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "Camèras" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "Camèras digitalas" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "Importar las fòtos numericas a la connexion" + +#. PDAs +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "PDA" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "Sincronizar los periferics Palm™ un còp connectats" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "Pocket PC" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "Sincronizar los periferics Pocket PC un còp connectats" + +#. Printers +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "Imprimentas" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "Executar una aplicacion a la connexion d'una imprimenta" + +#. Input Devices +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "Periferics d'entrada" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "Clavièrs" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "Executar automaticament una aplicacion al moment de la connexion d'un _clavièr USB" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "Mirgas" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Executar automaticament una aplicacion al moment de la connexion d'una _mirga USB" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "Tableta grafica" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "Executar una aplicacion a la connexion d'una _tableta grafica" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "Co_manda :" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "Impossible de dobrir lo navigador de documentacion" diff -Nru thunar-volman-0.6.1/po/pl.po thunar-volman-0.8.1/po/pl.po --- thunar-volman-0.6.1/po/pl.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/pl.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,28 +1,32 @@ -# Polish translations for thunar-volman. -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. -# Szymon Kałasz , 2007. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# OSWorld , 2013 +# Piotr Sokół , 2013 +# Piotr Strębski , 2013 +# Szymon Kałasz , 2007 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-27 04:51+0000\n" -"PO-Revision-Date: 2009-03-24 17:30+0100\n" -"Last-Translator: Piotr Sokół \n" -"Language-Team: Polish \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-06-01 18:09+0000\n" +"Last-Translator: OSWorld \n" +"Language-Team: Polish (http://www.transifex.com/projects/p/thunar-volman/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2));\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "Ścieżka sysfs nowo dodanego urządzenia" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Konfiguruje zarządzanie wymiennymi nośnikami oraz urządzeniami" @@ -36,21 +40,21 @@ msgid "Thunar Volume Manager" msgstr "Menedżer wolumenów programu Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Wszelkie prawa zastrzeżone." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Proszę zgłaszać błędy na adres <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "Nie ma urządzenia o ścieżce sysfs \"%s\"" +msgstr "Nie ma urządzenia o ścieżce sysfs „%s”" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Należy określić ścieżkę sysfs nowego urządzenia przez --device-added" @@ -81,7 +85,7 @@ #: ../thunar-volman/tvm-block-device.c:209 #: ../thunar-volman/tvm-block-device.c:278 msgid "Import _Photos" -msgstr "Zaimportuj _obrazy" +msgstr "Zaimportuj _zdjęcia" #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" @@ -210,13 +214,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Nieznany typ urządzenia blokowego" +msgid "Unknown block device type \"%s\"" +msgstr "Nieznany typ urządzenia blokowego „%s”" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Nie obsługiwany typ urządzenia" +msgid "Device type \"%s\" not supported" +msgstr "Nieobsługiwany typ urządzenia „%s”" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -246,8 +250,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Nieobsługiwany typ urządzenia wejściowego" +msgid "Unsupported input device type \"%s\"" +msgstr "Nieobsługiwany typ urządzenia wejściowego „%s”" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -268,7 +272,7 @@ #: ../thunar-volman/tvm-run.c:193 msgid "Burn _DVD" -msgstr "Nagraj _DVD" +msgstr "Nagraj płytę _DVD" #: ../thunar-volman/tvm-run.c:200 msgid "Blank CD inserted" @@ -314,15 +318,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Nieobsługiwany typ urządzenia USB" +msgid "Unsupported USB device type \"%s\"" +msgstr "Nieobsługiwany typ urządzenia USB „%s”" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Preferencje menedżera wolumenów programu Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Napędy i nośniki wymienne" @@ -356,7 +360,6 @@ msgstr "Skrypty powłoki" #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Nośniki pamięci" @@ -379,8 +382,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" -msgstr "" -"_Automatyczne uruchamianie programów zamieszczonych na napędach i nośnikach" +msgstr "_Automatyczne uruchamianie programów zamieszczonych na napędach i nośnikach" #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" @@ -403,7 +405,6 @@ msgstr "Polecenie dla płyt A_udio CD:" #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" @@ -448,7 +449,6 @@ msgstr "Odtwarzanie plików _muzycznych po podłączeniu" #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Aparaty fotograficzne" @@ -462,7 +462,6 @@ msgstr "Importowanie zdjęć po podłączeniu" #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA" @@ -484,7 +483,6 @@ msgstr "S_ynchronizowanie po podłączeniu" #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -495,7 +493,6 @@ msgstr "_Uruchamianie programu po podłączeniu" #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Urządzenia wejściowe" @@ -531,62 +528,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Nie udało się uruchomić przeglądarki dokumentacji" - -#~ msgid "input-keyboard" -#~ msgstr "Klawiatury" - -#~ msgid "Failed to open display" -#~ msgstr "Nie udało się otworzyć ekranu" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Zespół programistów Thunara. Wszelkie prawa zastrzeżone." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Napisany przez Benedikta Meurera ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Podane UDI „%s” nie jest prawidłowym UDI urządzenia HAL" - -#~ msgid "Encrypted volume" -#~ msgstr "Zaszyfrowany wolumen" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Montowanie zaszyfrowanego " -#~ "woluminu..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Ustawianie powłoki szyfrującej..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Brak uprawnień do skonfigurowania powłoki szyfrującej" - -#~ msgid "Wrong password" -#~ msgstr "Niepoprawne hasło" - -#~ msgid "Wrong password." -#~ msgstr "Niepoprawne hasło." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Wolumen jest zaszyfrowany." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Proszę wprowadzić hasło, aby odszyfrować i zamontować wolumen." - -#~ msgid "_Mount" -#~ msgstr "_Zamontuj" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Nie udało się skonfigurować zaszyfrowanego wolumenu" - -#~ msgid "Choose Disc Type" -#~ msgstr "Proszę wybrać typ dysku" - -#~ msgid "Make _DVD" -#~ msgstr "Utwórz _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Wymienne napędy i nośniki" diff -Nru thunar-volman-0.6.1/po/pt_BR.po thunar-volman-0.8.1/po/pt_BR.po --- thunar-volman-0.6.1/po/pt_BR.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/pt_BR.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,17 +1,18 @@ -# Brazilian Portuguese translations for Thunar-volman package. -# Copyright (C) 2007 THE Thunar-volman'S COPYRIGHT HOLDER -# This file is distributed under the same license as the Thunar-volman package. -# Fábio Nogueira , 2007-2008. -# Og Maciel , 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Og Maciel , 2008 +# Rafael Ferreira , 2013 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" -"PO-Revision-Date: 2008-08-30 13:32-0300\n" -"Last-Translator: Fábio Nogueira \n" -"Language-Team: Brazilian Portuguese \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-22 17:21+0000\n" +"Last-Translator: Rafael Ferreira \n" +"Language-Team: Portuguese (Brazil) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,11 +20,11 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "O caminho sysfs do dispositivo recentemente adicionado" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Configurar o gerenciamento de drives e mídias removíveis" @@ -33,25 +34,25 @@ msgstr "Imprime as informações sobre a versão e sai" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Gerenciador de volumes Thunar" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Todos os direitos reservados." -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." -msgstr "Por favor reporte os erros para <%s>." +msgstr "Por favor, relate os erros para <%s>." -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Não há dispositivo com o caminho sysfs \"%s\"" -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "É necessário especificar o caminho sysfs dos novos dispositivos com --device-added" @@ -59,7 +60,7 @@ #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 msgid "Photos and Music" -msgstr "Fotos e Músicas" +msgstr "Fotos e músicas" #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" @@ -98,7 +99,9 @@ msgstr "Um cartão de fotos foi detectado" #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" msgstr "Existem fotos no cartão. Você gostaria de adicionar estas fotos no seu álbum?" #. prompt the user to execute the file @@ -175,12 +178,12 @@ #: ../thunar-volman/tvm-block-device.c:694 #, c-format msgid "Unable to locate mount point" -msgstr "Não é possível localizar ponto de montagem" +msgstr "Não foi possível localizar ponto de montagem" #: ../thunar-volman/tvm-block-device.c:740 #, c-format msgid "Unable to mount the device" -msgstr "Não é possível montar o dispositivo" +msgstr "Não foi possível montar o dispositivo" #: ../thunar-volman/tvm-block-device.c:749 #, c-format @@ -189,11 +192,11 @@ #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "CD de áudio / Dados" +msgstr "CD de áudio/dados" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" -msgstr "O CD no dispositivo contém músicas e arquivos juntos." +msgstr "O CD no dispositivo contém músicas e arquivos." #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" @@ -209,17 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Tipo de dispositivo de bloco desconhecido" +msgid "Unknown block device type \"%s\"" +msgstr "Tipo de dispositivo de bloco \"%s\" desconhecido" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Tipo de dispositivo não suportado" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "Teclados" +msgid "Device type \"%s\" not supported" +msgstr "Tipo de dispositivo \"%s\" não suportado" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -229,11 +228,6 @@ msgid "A keyboard was detected" msgstr "Um teclado foi detectado" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "Tablet" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -244,10 +238,6 @@ msgid "A graphics tablet was detected" msgstr "Um tablet foi detectado" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "Mouse" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "Mouse detectado" @@ -258,13 +248,13 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Tipo de dispositivo de entrada não suportado" +msgid "Unsupported input device type \"%s\"" +msgstr "Tipo de dispositivo de entrada \"%s\" não suportado" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "A gravação automática de CDs e DVDs em branco está desabilitada" +msgstr "A gravação automática de CDs e DVDs em branco está desativada" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" @@ -272,7 +262,7 @@ #: ../thunar-volman/tvm-run.c:190 msgid "You have inserted a blank DVD." -msgstr "Você inseriu um disco em branco." +msgstr "Você inseriu um DVD em branco." #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -288,7 +278,7 @@ #: ../thunar-volman/tvm-run.c:201 msgid "You have inserted a blank CD." -msgstr "Você inseriu um CD em branco" +msgstr "Você inseriu um CD em branco." #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" @@ -314,7 +304,7 @@ #: ../thunar-volman/tvm-usb-device.c:63 msgid "A photo camera was detected" -msgstr "Um cartão de foto foi detectado." +msgstr "Uma câmera fotográfica foi detectada." #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" @@ -326,18 +316,18 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Tipo de dispositivo USB não suportado" +msgid "Unsupported USB device type \"%s\"" +msgstr "Tipo de dispositivo USB \"%s\" não suportado" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Configurações do Gerenciador de volumes do Thunar" +msgstr "Configurações do gerenciador de volumes do Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" -msgstr "Mídias e Unidades removíveis" +msgstr "Mídias e unidades removíveis" #: ../thunar-volman-settings/tvm-command-entry.c:240 msgid "Select an Application" @@ -365,7 +355,7 @@ #: ../thunar-volman-settings/tvm-command-entry.c:288 msgid "Shell Scripts" -msgstr "Scripts Shell" +msgstr "Scripts do Shell" #. Storage #. @@ -379,7 +369,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:158 msgid "_Mount removable drives when hot-plugged" -msgstr "_Montar unidades removíveis quando conectados" +msgstr "_Montar unidades removíveis quando conectadas" #: ../thunar-volman-settings/tvm-preferences-dialog.c:166 msgid "Mount removable media when _inserted" @@ -456,7 +446,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" -msgstr "Reproduzir _música quando conectado" +msgstr "Reproduzir _músicas ao conectar" #. Cameras #. @@ -470,7 +460,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "Importar fotografias digitais quando conectadas" +msgstr "Importar fotografias digitais quando conectada" #. PDAs #. @@ -484,7 +474,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:458 msgid "Sync _Palm™ devices when connected" -msgstr "Sincronizar dispositivos _Palm™ quando conectados" +msgstr "Sincronizar dispositivos _Palm™ ao conectar" #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" @@ -516,7 +506,7 @@ msgstr "Teclados" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" +msgid "Automatically run a program when a USB _keyboard is connected" msgstr "Executar automaticamente um programa quando um _teclado USB for conectado" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 @@ -524,7 +514,7 @@ msgstr "Mouse" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" +msgid "Automatically run a program when a USB _mouse is connected" msgstr "Executar automaticamente um programa quando um _mouse USB for conectado" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 @@ -542,54 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Falha ao abrir o navegador de documentação" - -#~ msgid "Failed to open display" -#~ msgstr "Falha ao abrir a exibição" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "O time de desenvolvimento do Thunar. Todos os direitos reservados." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Escrito por Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "O UDI especificado \"%s\" não é um UDI de dispositivo HAL válido" - -#~ msgid "Encrypted volume" -#~ msgstr "Volume criptografado" - -#~ msgid "Mounting encrypted volume..." -#~ msgstr "Montando volume criptografado..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Configurando a camada de criptografia..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Você não tem privilégios para configurar a camada de cripografia" - -#~ msgid "Wrong password" -#~ msgstr "Senha incorreta" - -#~ msgid "Wrong password." -#~ msgstr "Senha incorreta." - -#~ msgid "This volume is encrypted." -#~ msgstr "Este volume está criptografado." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Por favor, entre com sua senha para descriptografar e montar o volume." - -#~ msgid "_Mount" -#~ msgstr "_Montar" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Falhou ao configurar o volume criptografado." - -#~ msgid "Choose Disc Type" -#~ msgstr "Escolha o tipo de disco" - -#~ msgid "Make _DVD" -#~ msgstr "Criar _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Mídia removível" diff -Nru thunar-volman-0.6.1/po/pt.po thunar-volman-0.8.1/po/pt.po --- thunar-volman-0.6.1/po/pt.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/pt.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,55 +1,57 @@ -# European Portuguese translation for thunar-volman. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Nuno Miguel , 2007-2009. -# +# +# Translators: +# nunom , 2013 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.3.80\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-18 10:48+0000\n" -"PO-Revision-Date: 2012-01-18 11:57-0000\n" -"Last-Translator: Sérgio Marques \n" -"Language-Team: \n" -"Language: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-29 13:57+0000\n" +"Last-Translator: nunom \n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/xfce/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "O caminho sysfs do dispositivo agora adicionado" +msgid "The sysfs path of the newly added device" +msgstr "A localização do novo dispositivo adicionado" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "Configurar gestão de unidades e discos amovíveis " +msgstr "Configurar gestão de unidades amovíveis" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "Imprimir informações da versão e sair" +msgstr "Mostrar informação da versão e sair" #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Gestor de volumes Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." -msgstr "Todos os direitos reservados" +msgstr "Todos os direitos reservados." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." -msgstr "Por favor, reporte os erros em <%s>." +msgstr "Por favor, reporte os erros para <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "Não existe qualquer dispositivo no caminho sysfs \"%s\"." +msgstr "Não existe qualquer dispositivo no caminho \"%s\" do sysfs " -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Tem de especificar o caminho sysfs do novo dispositivo com --device-added" @@ -57,7 +59,7 @@ #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 msgid "Photos and Music" -msgstr "Fotos e música" +msgstr "Fotos e Música" #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" @@ -65,15 +67,14 @@ #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" -msgstr "Pretende importar as fotos ou gerir a música?" +msgstr "Deseja importar as fotos ou gerir a música?" #: ../thunar-volman/tvm-block-device.c:208 #: ../thunar-volman/tvm-block-device.c:277 #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid "Ig_nore" msgstr "Ig_norar" @@ -90,14 +91,16 @@ #. ask the user to import photos #: ../thunar-volman/tvm-block-device.c:273 msgid "Photo Import" -msgstr "Importação de fotos" +msgstr "Importação de Fotos" #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" msgstr "Foi detetado um cartão de fotos" #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" msgstr "Existem fotos no cartão. Deseja adicionar as fotos ao seu álbum?" #. prompt the user to execute the file @@ -116,26 +119,26 @@ #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid "Auto-Run capability detected" -msgstr "Detetada a possibilidade de execução automática" +msgstr "Detetada a capacidade de execução automática" #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 msgid "_Allow Auto-Run" -msgstr "Permitir execução _automática" +msgstr "_Permitir execução automática" #. prompt the user whether to autoopen this file #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "Gostaria de abrir \"%s\"?" +msgstr "Deseja abrir \"%s\"?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" -msgstr "Confirmação de abertura automática" +msgstr "Confirmação de Execução Automática" #: ../thunar-volman/tvm-block-device.c:506 msgid "Auto-Open capability detected" -msgstr "Detetada a possibilidade de abertura automática" +msgstr "Detetada a capacidade de abertura automática" #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" @@ -188,15 +191,15 @@ #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "CD de áudio/dados" +msgstr "CD de Áudio/Dados" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" -msgstr "O CD na unidade contém músicas e ficheiros" +msgstr "O CD na unidade contém música e ficheiros" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "Pretende ouvir as músicas ou explorar os ficheiros?" +msgstr "Deseja ouvir música ou explorar os ficheiros?" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" @@ -208,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "O tipo de dispositivo é desconhecido" +msgid "Unknown block device type \"%s\"" +msgstr "O tipo de dispositivo \"%s\" é desconhecido" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "O tipo de dispositivo não é suportado" +msgid "Device type \"%s\" not supported" +msgstr "O tipo de dispositivo \"%s\" não é suportado" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -232,11 +235,11 @@ #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "Foi detetado um tablet" +msgstr "Foi detetado um tablet de gráficos" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" -msgstr "Detetado um rato" +msgstr "Rato detetado" #: ../thunar-volman/tvm-input-device.c:112 msgid "A mouse was detected" @@ -244,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "O dispositivo introduzido não é suportado" +msgid "Unsupported input device type \"%s\"" +msgstr "O tipo de dispositivo introduzido \"%s\" não é suportado" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -258,12 +261,11 @@ #: ../thunar-volman/tvm-run.c:190 msgid "You have inserted a blank DVD." -msgstr "Inseriu um DVD vazio" +msgstr "Inseriu um DVD vazio." -#: ../thunar-volman/tvm-run.c:191 -#: ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" -msgstr "O que pretende fazer?" +msgstr "Que deseja fazer?" #: ../thunar-volman/tvm-run.c:193 msgid "Burn _DVD" @@ -275,7 +277,7 @@ #: ../thunar-volman/tvm-run.c:201 msgid "You have inserted a blank CD." -msgstr "Inseriu um CD vazio" +msgstr "Inseriu um CD vazio." #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" @@ -283,7 +285,7 @@ #: ../thunar-volman/tvm-run.c:205 msgid "Burn _Audio CD" -msgstr "Gr_avar CD de áudio" +msgstr "Gravar CD de á_udio" #: ../thunar-volman/tvm-run.c:229 #, c-format @@ -297,7 +299,7 @@ #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" -msgstr "Detetada uma máquina fotográfica" +msgstr "Máquina fotográfica detetada" #: ../thunar-volman/tvm-usb-device.c:63 msgid "A photo camera was detected" @@ -305,7 +307,7 @@ #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" -msgstr "Detetada uma impressora" +msgstr "Foi detetada uma impressora" #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" @@ -313,22 +315,22 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "O dispositivo USB não é suportado" +msgid "Unsupported USB device type \"%s\"" +msgstr "O tipo de dispositivo USB \"%s\" não é suportado" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Definições do Gestor de volumes do Thunar" +msgstr "Definições do Gestor de Volumes do Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" -msgstr "Unidades amovíveis e discos" +msgstr "Unidades amovíveis" #: ../thunar-volman-settings/tvm-command-entry.c:240 msgid "Select an Application" -msgstr "Selecione uma aplicação" +msgstr "Seleccione uma aplicação" #: ../thunar-volman-settings/tvm-command-entry.c:250 msgid "All Files" @@ -352,11 +354,10 @@ #: ../thunar-volman-settings/tvm-command-entry.c:288 msgid "Shell Scripts" -msgstr "Scripts de Shell" +msgstr "Scripts Shell" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Armazenamento" @@ -379,7 +380,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" -msgstr "Executar _automaticamente os programas das unidades amovíveis" +msgstr "E_xecutar automaticamente os programas das unidades amovíveis" #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" @@ -401,9 +402,8 @@ msgid "Command for A_udio CDs:" msgstr "Comando para CDs de á_udio:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimédia" @@ -414,7 +414,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "Reproduzir CDs de áudio qu_ando inseridos" +msgstr "Reproduzir CDs de á_udio quando inseridos" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -447,9 +447,8 @@ msgid "Play _music files when connected" msgstr "Reproduzir ficheiros de _música quando ligado" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Máquinas fotográficas" @@ -462,9 +461,8 @@ msgid "Import digital photographs when connected" msgstr "Importar fotos digitais quando ligado" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -485,9 +483,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Sincronizar P_C de bolso quando ligado" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -495,11 +492,10 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "Executar automaticamente um programa ao ligar uma im_pressora" +msgstr "Executar automaticamente um programa ao ligar uma i_mpressora" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Dispositivos de entrada" @@ -510,7 +506,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "Executar automaticamente um programa ao ligar um tecl_ado USB" +msgstr "Executar automaticamente um programa ao ligar um tecla_do USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" @@ -535,12 +531,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Falha ao abrir a documentação" - -#~ msgid "input-keyboard" -#~ msgstr "Teclado" - -#~ msgid "input-tablet" -#~ msgstr "\"Tablet\"" - -#~ msgid "input-mouse" -#~ msgstr "Rato" diff -Nru thunar-volman-0.6.1/po/ro.po thunar-volman-0.8.1/po/ro.po --- thunar-volman-0.6.1/po/ro.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ro.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,61 +1,61 @@ -# Romanian translation for thunar-volman. -# Copyright (C) 2011 thunar-volman'S COPYRIGHT HOLDER -# This file is distributed under the same license as the thunar-volm package. -# Mișu Moldovan , 2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mișu Moldovan , 2015 +# Mișu Moldovan , 2011 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" -"PO-Revision-Date: 2011-01-16 21:27+0200\n" -"Last-Translator: Mișu Moldovan \n" -"Language-Team: Romanian \n" -"Language: ro\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2015-02-15 17:03+0000\n" +"Last-Translator: Mișu Moldovan \n" +"Language-Team: Romanian (http://www.transifex.com/projects/p/thunar-volman/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " -"20)) ? 1 : 2);;\n" -"X-Generator: Virtaal 0.6.1\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "Calea sysfs pentru dispozitivul nou adăugat" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Configurați managementul dispozitivelor detașabile" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "Arată detalii despre versiune și ieși" +msgstr "Arată doar detalii despre versiune" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Managerul de volume Thunar" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Toate drepturile sunt rezervate." -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Raportați problemele la <%s>." -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Nu există un dispozitiv cu calea sysfs „%s”" -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "Trebuie să specificați calea noilor dispozitive cu --device-added" +msgstr "Trebuie să specificați calea sysfs a noilor dispozitive cu --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -64,7 +64,7 @@ #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" -msgstr "S-au găsit poze în acest player portabil" +msgstr "S-au găsit poze în playerul conectat" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -83,7 +83,7 @@ #: ../thunar-volman/tvm-block-device.c:209 #: ../thunar-volman/tvm-block-device.c:278 msgid "Import _Photos" -msgstr "I_mportă pozele" +msgstr "Importă po_zele" #: ../thunar-volman/tvm-block-device.c:210 msgid "Manage _Music" @@ -102,8 +102,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"S-au detectat poze pe acest card. Doriți să le adăugați în albumul propriu?" +msgstr "S-au detectat poze pe acest card. Doriți să le adăugați la albumele de pe acest calculator?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -111,7 +110,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "Permiteți lansarea „%s”?" +msgstr "Permiteți lansarea programului „%s”?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -201,7 +200,7 @@ #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "Doriți să ascultați muzica sau să afișați fișierele?" +msgstr "Doriți să ascultați muzica sau să vedeți fișierele?" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" @@ -213,17 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Tip necunoscut de dispozitiv «block»" +msgid "Unknown block device type \"%s\"" +msgstr "Tip necunoscut de dispozitiv «block»: „%s”" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Nu există suport pentru acest tip de dispozitiv" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "input-keyboard" +msgid "Device type \"%s\" not supported" +msgstr "Nu există suport pentru tipul de dispozitiv „%s”" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -233,11 +228,6 @@ msgid "A keyboard was detected" msgstr "S-a detectat o tastatură" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "input-tablet" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" @@ -248,10 +238,6 @@ msgid "A graphics tablet was detected" msgstr "S-a detectat o tabletă" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "input-mouse" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "Maus detectat" @@ -262,13 +248,13 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Nu există suport pentru acest dispozitiv de input" +msgid "Unsupported input device type \"%s\"" +msgstr "Nu există suport pentru dispozitivul de input de tip „%s”" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "Scrierea automată pentru CD-uri și DVD-uri goale este dezactivată" +msgstr "Inscripționarea automată pentru CD-uri și DVD-uri goale este dezactivată" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" @@ -284,7 +270,7 @@ #: ../thunar-volman/tvm-run.c:193 msgid "Burn _DVD" -msgstr "Scrie _DVD-ul" +msgstr "Inscripționare _DVD" #: ../thunar-volman/tvm-run.c:200 msgid "Blank CD inserted" @@ -296,11 +282,11 @@ #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" -msgstr "Scrie un CD cu _date" +msgstr "Inscripționare CD cu _date" #: ../thunar-volman/tvm-run.c:205 msgid "Burn _Audio CD" -msgstr "Scrie un CD _audio" +msgstr "Inscripționare CD _audio" #: ../thunar-volman/tvm-run.c:229 #, c-format @@ -310,7 +296,7 @@ #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "Comanda pentru redarea de CD-uri este nulă" +msgstr "Comanda pentru redarea de CD-uri este nedefinită" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" @@ -330,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Nu există suport pentru acest dispozitiv USB" +msgid "Unsupported USB device type \"%s\"" +msgstr "Nu există suport pentru dispozitivul USB de tip „%s”" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Opțiunile managerului de volume Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Unități detașabile și alte medii" @@ -369,11 +355,9 @@ #: ../thunar-volman-settings/tvm-command-entry.c:288 msgid "Shell Scripts" -msgstr "Scripturi Shell" +msgstr "Scripturi shell" -#. #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Stocare" @@ -400,7 +384,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" -msgstr "Deschide automat _fișierele de pe dispozitive și medii noi" +msgstr "Deschide automat _fișierele de pe discuri și dispozitive noi" #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" @@ -408,7 +392,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" -msgstr "A_rde imediat un CD ori DVD gol inserat" +msgstr "Insc_ripționare imediată pentru discurile goale la inserare" #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" @@ -418,9 +402,7 @@ msgid "Command for A_udio CDs:" msgstr "Comandă pentru CD-uri a_udio:" -#. #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" @@ -464,9 +446,7 @@ msgid "Play _music files when connected" msgstr "_Redă fișierele audio la conectare" -#. #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Camere foto" @@ -479,9 +459,7 @@ msgid "Import digital photographs when connected" msgstr "Importă _fotografiile digitale la conectare" -#. #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA-uri" @@ -502,9 +480,7 @@ msgid "Sync Pocket P_C devices when connected" msgstr "_Sincronizează dispozitivele PocketPC la conectare" -#. #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -514,9 +490,7 @@ msgid "Automatically run a program when a _printer is connected" msgstr "_Pornește automat un program la conectarea unei imprimante" -#. #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Dispozitive de input" @@ -526,16 +500,16 @@ msgstr "Tastaturi" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" -msgstr "Pornește automat un program la conectarea unei tastaturi _USB" +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "_Pornește automat un program la conectarea unei tastaturi USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Mausuri" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" -msgstr "Pornește automat un program la conectarea unui _maus USB" +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Pornește automat un program la conectarea unui maus _USB" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -551,4 +525,4 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" -msgstr "Nu s-a putut deschide navigatorul documentației" +msgstr "Nu s-a putut deschide documentația" diff -Nru thunar-volman-0.6.1/po/ru.po thunar-volman-0.8.1/po/ru.po --- thunar-volman-0.6.1/po/ru.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ru.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,32 +1,33 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Pavel Labushev , 2009. # +# Translators: +# Pavel Labushev , 2009 +# Sergey Alyoshin , 2013,2015 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-08 02:39+0000\n" -"PO-Revision-Date: 2009-02-20 12:42+0700\n" -"Last-Translator: Pavel Labushev \n" -"Language-Team: Russian \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2015-02-08 13:09+0000\n" +"Last-Translator: Sergey Alyoshin \n" +"Language-Team: Russian (http://www.transifex.com/projects/p/thunar-volman/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"X-Poedit-Language: Russian\n" -"X-Poedit-Country: RUSSIAN FEDERATION\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "Путь в sysfs для только что добавленного устройства" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "Настроить управление томами" +msgstr "Управление съёмными устройствами и накопителями" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" @@ -37,26 +38,24 @@ msgid "Thunar Volume Manager" msgstr "Менеджер томов для Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Все права защищены." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Пожалуйста, сообщайте об ошибках по адресу <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "Не найдено устройства по системному пути \"%s\"" +msgstr "Не найдено устройства по системному пути «%s»" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"Необходимо указать путь в sysfs для новых устройств с помощью ключа --device-" -"added" +msgstr "Необходимо указать путь в sysfs для новых устройств с помощью ключа --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -97,13 +96,13 @@ #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" -msgstr "Обнаружена флеш-карта с фотографиями" +msgstr "Обнаружена карта памяти с фотографиями" #: ../thunar-volman/tvm-block-device.c:275 msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "На флэш-карте обнаружены фотографии. Хотите добавить их в альбом?" +msgstr "На карте памяти обнаружены фотографии. Хотите добавить их в альбом?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -111,7 +110,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "Разрешить запуск \"%s\"?" +msgstr "Разрешить запуск «%s»?" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -132,7 +131,7 @@ #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "Хотите открыть \"%s\"?" +msgstr "Хотите открыть «%s»?" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" @@ -169,7 +168,7 @@ #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "Том \"%s\" подключен автоматически" +msgstr "Том «%s» подключен автоматически" #: ../thunar-volman/tvm-block-device.c:640 #, c-format @@ -213,13 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Неизвестный тип блочного устройства" +msgid "Unknown block device type \"%s\"" +msgstr "Неизвестный тип блочного устройства «%s»" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Неподдерживаемый тип устройства" +msgid "Device type \"%s\" not supported" +msgstr "Неподдерживаемый тип устройства «%s»" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -249,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Неизвестный тип устройства ввода" +msgid "Unsupported input device type \"%s\"" +msgstr "Неподдерживаемое устройство ввода «%s»" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -275,11 +274,11 @@ #: ../thunar-volman/tvm-run.c:200 msgid "Blank CD inserted" -msgstr "Вставлен чистый CD" +msgstr "Вставлен чистый CD-диск" #: ../thunar-volman/tvm-run.c:201 msgid "You have inserted a blank CD." -msgstr "Вы вставили чистый CD." +msgstr "Вы вставили чистый CD-диск." #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" @@ -317,18 +316,18 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Неподдерживаемое устройство USB" +msgid "Unsupported USB device type \"%s\"" +msgstr "Неподдерживаемое USB-устройство «%s»" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Параметры Менеджера томов Thunar" +msgstr "Параметры менеджера томов Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" -msgstr "Съемные устройства и носители данных" +msgstr "Съёмные устройства и носители данных" #: ../thunar-volman-settings/tvm-command-entry.c:240 msgid "Select an Application" @@ -359,7 +358,6 @@ msgstr "Сценарии Shell" #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Накопители" @@ -394,8 +392,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" -msgstr "" -"Запускать приложение для _записи дисков при обнаружении пустого CD или DVD" +msgstr "Запускать приложение для _записи дисков при обнаружении пустого CD или DVD" #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" @@ -406,7 +403,6 @@ msgstr "Команда для записи _аудио" #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Мультимедиа" @@ -440,7 +436,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:505 #: ../thunar-volman-settings/tvm-preferences-dialog.c:640 msgid "C_ommand:" -msgstr "К_оманда:" +msgstr "Кома_нда:" #: ../thunar-volman-settings/tvm-preferences-dialog.c:343 msgid "Portable Music Players" @@ -451,7 +447,6 @@ msgstr "Проигрывать файлы с _музыкой при подключении плеера" #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Камеры" @@ -462,10 +457,9 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "_Импортировать цифровые фотографии при подключении камеры" +msgstr "Импортировать цифровые _фотографии при подключении камеры" #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "КПК" @@ -487,7 +481,6 @@ msgstr "Синхронизировать _КПК при подключении" #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -498,7 +491,6 @@ msgstr "Запускать приложение при подключении _принтера" #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Устройства ввода" @@ -509,7 +501,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "Запускать приложение при подключении USB-_клавиатуры" +msgstr "Запускать приложение при подключении USB-к_лавиатуры" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" @@ -517,7 +509,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 msgid "Automatically run a program when a USB _mouse is connected" -msgstr "Запускать приложение при подключении USB-_мыши" +msgstr "Запускать приложение при подключении USB-мы_ши" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -529,72 +521,8 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" -msgstr "Ко_манда:" +msgstr "Кома_нда:" #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Не удалось открыть обозреватель документации" - -#~ msgid "input-keyboard" -#~ msgstr "input-keyboard" - -#~ msgid "input-tablet" -#~ msgstr "input-tablet" - -#~ msgid "input-mouse" -#~ msgstr "input-mouse" - -#~ msgid "Failed to open display" -#~ msgstr "Невозможно открыть дисплей" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Команда разработчиков Thunar. Все права защищены." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Автор - Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Указанный UDI \"%s\" не является допустимым UDI устройства HAL" - -#~ msgid "Encrypted volume" -#~ msgstr "Зашифрованный том" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Подключение зашифрованного тома..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Настройка подсистемы шифрования..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "У вас недостаточно привилегий для настройки подсистемы шифрования" - -#~ msgid "Wrong password" -#~ msgstr "Неправильный пароль" - -#~ msgid "Wrong password." -#~ msgstr "Неправильный пароль." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "Этот том зашифрован." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Введите пароль для настройки и подключения зашифрованного тома." - -#~ msgid "_Mount" -#~ msgstr "_Подключить" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Не удалось настроить зашифрованный том" - -#~ msgid "Choose Disc Type" -#~ msgstr "Выберите тип диска" - -#~ msgid "Make _DVD" -#~ msgstr "_Записать DVD" - -#~ msgid "Removable Media" -#~ msgstr "Съемные носители" diff -Nru thunar-volman-0.6.1/po/sk.po thunar-volman-0.8.1/po/sk.po --- thunar-volman-0.6.1/po/sk.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/sk.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,34 +1,33 @@ -# Slovak translation of thunar-volman. -# Copyright (C) 2007 THE thunar-volman'S COPYRIGHT HOLDER -# This file is distributed under the same license as the thunar-volman package. -# Jeff Bailes , 2007. -# Slavko , 2009. -# Robert Hartl , 2009. -# Tomáš Vadina , 2011, 2012. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jeff Bailes , 2007 +# Robert Hartl , 2009 +# Slavko , 2015 +# Slavko , 2009 +# Tomáš Vadina , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.6.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-09 04:00+0000\n" -"PO-Revision-Date: 2012-02-09 08:53+0100\n" -"Last-Translator: Tomáš Vadina \n" -"Language-Team: slovenčina \n" -"Language: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2015-02-21 07:25+0000\n" +"Last-Translator: Slavko \n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/thunar-volman/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Poedit-Language: Slovak\n" -"X-Poedit-Country: SLOVAKIA\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Cesta syfs novo pridaného zariadenia" +msgid "The sysfs path of the newly added device" +msgstr "Cesta sysfs novo pridaného zariadenia" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Nastavenie správy vymeniteľných zariadení a médií" @@ -42,26 +41,24 @@ msgid "Thunar Volume Manager" msgstr "Správca médií Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Všetky práva vyhradené." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Prosím, chyby hláste na <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Neexistuje zariadenie s cestou sysfs \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" -"Je potrebné zadať novú cestu sysfs nového zariadenia pomocou prepínača --" -"device-added" +msgstr "Je potrebné zadať novú cestu sysfs nového zariadenia pomocou prepínača --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -108,9 +105,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Na pamäťovej karte sú fotografie. Chcete tieto fotografie pridať do svojho " -"albumu?" +msgstr "Na pamäťovej karte sú fotografie. Chcete tieto fotografie pridať do svojho albumu?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -220,13 +215,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Neznámy typ blokového zariadenia" +msgid "Unknown block device type \"%s\"" +msgstr "Neznáme blokové zariadenie typu „%s”" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Typ zariadenia nie je podporovaný" +msgid "Device type \"%s\" not supported" +msgstr "Typ zariadenia „%s” nie je podporovaný" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -256,8 +251,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Nepodporované vstupné zariadenie" +msgid "Unsupported input device type \"%s\"" +msgstr "Nepodporovaný typ vstupného zariadenia „%s”" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -324,15 +319,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Nepodporovaný typ USB zariadenia" +msgid "Unsupported USB device type \"%s\"" +msgstr "Nepodporovaný typ USB zariadenia „%s”" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Nastavenia Správcu zväzkov aplikácie Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Vymeniteľné zariadenia a médiá" @@ -365,9 +360,7 @@ msgid "Shell Scripts" msgstr "Skripty shellu" -#. #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Úložisko" @@ -412,9 +405,7 @@ msgid "Command for A_udio CDs:" msgstr "Príkaz pre _zvukové disky CD:" -#. #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimédiá" @@ -458,9 +449,7 @@ msgid "Play _music files when connected" msgstr "Prehrať _hudobné súbory po pripojení" -#. #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Fotoaparáty" @@ -473,9 +462,7 @@ msgid "Import digital photographs when connected" msgstr "Importovať digitálne fotografie po pripojení" -#. #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "Zariadenia PDA" @@ -496,9 +483,7 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Synchronizovať zariadenia Pocket P_C po pripojení" -#. #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -508,9 +493,7 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Automaticky spustiť program po pripojení _tlačiarne" -#. #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Vstupné zariadenia" @@ -546,68 +529,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Zlyhalo otvorenie prehliadača dokumentácie" - -#~ msgid "input-keyboard" -#~ msgstr "vstup-klávesnica" - -#~ msgid "input-tablet" -#~ msgstr "vstup-tablet" - -#~ msgid "input-mouse" -#~ msgstr "vstup-myš" - -#~ msgid "Failed to open display" -#~ msgstr "Zlyhalo otvorenie displeja" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Vývojový tím Thunar. Všetky práva vyhradené." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Napísal Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Zadané UDI \"%s\" nie je platné HAL UDI zariadenia" - -#~ msgid "Encrypted volume" -#~ msgstr "Šifrovaný zväzok" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Pripájanie šifrovaného zväzku..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Nastavovanie šifrovacej vrstvy..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Nemáte oprávnenie nastavovať šifrovaciu vrstvu" - -#~ msgid "Wrong password" -#~ msgstr "Nesprávne heslo" - -#~ msgid "Wrong password." -#~ msgstr "Nesprávne heslo." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Tento zväzok je šifrovaný." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Pre odšifrovanie a pripojenie zadajte heslo." - -#~ msgid "_Mount" -#~ msgstr "_Pripojiť" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Nepodarilo sa nastaviť šifrovaný zväzok" - -#~ msgid "Choose Disc Type" -#~ msgstr "Zvoľte typ disku" - -#~ msgid "Make _DVD" -#~ msgstr "Vytvoriť _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Vyberateľné médiá" diff -Nru thunar-volman-0.6.1/po/sl.po thunar-volman-0.8.1/po/sl.po --- thunar-volman-0.6.1/po/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/sl.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,533 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Klemen Košir , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-24 11:16+0000\n" +"Last-Translator: Klemen Košir \n" +"Language-Team: Slovenian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "Pot \"sysfs\" do novo dodane naprave" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "Odpre nastavitve odstranljivih pogonov in nosilcev" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "Podatki o različici" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "Upravljalnik nosilcev za Thunar" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "Vse pravice pridržane." + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Prosimo, sporočite napake na <%s>." + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "Naprava s potjo \"%s\" ne obstaja" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "Pot do nove naprave morate podati z argumentom --device-added" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "Fotografije in glasba" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "Na predvajalniku glasbe so bile najdene fotografije." + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "Ali želite uvoziti fotografije ali upravljati glasbo?" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "_Prezri" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "Uvozi _fotografije" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "Upravljaj _glasbo" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "Uvoz fotografij" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "Zaznana je bila kartica s fotografijami." + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "Ali jih želite dodati v album?" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "Ali želite zagnati datoteko \"%s\"?" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "Samodejni zagon" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "Zaznana je bila možnost samodejnega zagona." + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "_Zaženi" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "Ali želite odpreti datoteko \"%s\"?" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "Samodejno odpiranje" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "Zaznana je bila možnost samodejnega odpiranja." + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "_Odpri" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "CD" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "DVD" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "Vstavljeni CD je bil samodejno priklopljen" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "Vstavljeni DVD je bil samodejno priklopljen" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "Odstranljiv nosilec" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "Nosilec \"%s\" je bil samodejno priklopljen" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "Vstavljeni nosilec je bil samodejno priklopljen" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "Priklopne točke ni mogoče najti" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "Naprave ni mogoče priklopiti" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "Nosilca, ki pripada napravi, ni mogoče zaznati" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "Podatkovni/zvočni CD" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "Vstavljeni CD vsebuje tako glasbo kot datoteke." + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "Ali želite poslušati glasbo ali brskati po datotekah?" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "_Brskaj po datotekah" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "_Predvajaj CD" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "Neznana vrsta blokovne naprave: \"%s\"" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "Naprava \"%s\" ni podprta" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "Tipkovnica" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "Zaznana je bila tipkovnica" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "Grafična tablica" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "Zaznana je bila grafična tablica" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "Miška" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "Zaznana je bila miška" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "Vhodna naprava \"%s\" ni podprta" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "Samodejno zapisovanje praznih CD-jev in DVD-jev je onemogočeno" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "Prazen DVD" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "Vstavili ste prazen DVD." + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "Kaj želite storiti?" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "Zapiši _DVD" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "Prazen CD" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "Vstavili ste prazen CD." + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "Zapiši _podatkovni CD" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "Zapiši _zvočni CD" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "Ukaz za zapisovanje ne sme biti prazen" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "Ukaz predvajalnika CD-jev ni določen" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "Digitalni fotoaparat" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "Zaznan je bil digitalni fotoaparat" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "Tiskalnik" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "Zaznan je bil tiskalnik" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "Naprave USB vrste \"%s\" niso podprte" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "Nastavitve upravljalnika nosilcev" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "Odstranljivi pogoni in nosilci" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "Izberite program" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "Vse datoteke" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "Izvedljive datoteke" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "Skripti Perl" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "Skripti Python" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "Skripti Ruby" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "Skripti ukazne lupine" + +#. Storage +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "Pomnilniške naprave" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "Odstranljive naprave" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "Samodejno priklopi odstranljive _pogone" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "Samodejno priklopi odstranljive _nosilce" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "Samodejno _odpri odstranljive nosilce" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "_Samodejno zaženi programe na novih pogonih in nosilcih" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "Samodejno odpri datoteke na novih pogonih in nosilcih" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "Prazni CD-ji in DVD-ji" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "_Zapiši prazne vstavljene CD-je in DVD-je" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "Ukaz za _podatkovne CD-je:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "Ukaz za _zvočne CD-je:" + +#. Multimedia +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "Predstavnost" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "Zvočni CD-ji" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "Samodejno predvajaj _zvočne CD-je" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "_Ukaz:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "Video CD-ji/DVD-ji" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "Samodejno predvajaj _video CD-je in DVD-je" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "U_kaz:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "Predvajalniki glasbe" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "Samodejno predvajaj _glasbo" + +#. Cameras +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "Fotoaparati" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "Digitalni fotoaparati" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "Samodejno uvozi fotografije" + +#. PDAs +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "Dlančniki" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "Samodejno uskladi povezane naprave _Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "Pocket PC" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "Samodejno uskladi povezane naprave Pocket P_C" + +#. Printers +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "Tiskalniki" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "Samodejno zaženi program, ko je priklopljen _tiskalnik" + +#. Input Devices +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "Vhodne naprave" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "Tipkovnice" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "Samodejno zaženi program, ko je priklopljena _tipkovnica" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "Miške" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Samodejno zaženi program, ko je priklopljena _miška" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "Grafična tablica" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "Samodejno zaženi program, ko je priklopljena _grafična tablica" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "Uka_z:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "Brskalnika dokumentacije ni mogoče odpreti" diff -Nru thunar-volman-0.6.1/po/sq.po thunar-volman-0.8.1/po/sq.po --- thunar-volman-0.6.1/po/sq.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/sq.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,27 +1,29 @@ -# Albanian translation of thunar-volman package -# Copyright (C) 2007 Benedikt Meurer. -# This file is distributed under the same license as the thunar-volman package. -# Besnik Bleta , 2007. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Besnik , 2007 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2008-11-04 22:37+0200\n" -"Last-Translator: Besnik Bleta \n" -"Language-Team: Albanian \n" -"Language: sq\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/xfce/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -#, fuzzy -msgid "The syfs path of the newly added device" -msgstr "Pajisja HAL UDI e pajisjes së shtuar rishtazi" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Formësoni administrimin e pajisjeve dhe mediave të heqshme" @@ -35,24 +37,24 @@ msgid "Thunar Volume Manager" msgstr "Përgjegjësi i Volumit Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "" -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Ju lutem njoftoni të meta te <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "" -#: ../thunar-volman/main.c:186 -#, fuzzy, c-format +#: ../thunar-volman/main.c:188 +#, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "Duhet të tregoni pajisjes e re HAL UDI me --device-added" +msgstr "" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -60,9 +62,8 @@ msgstr "Foto dhe Muzikë" #: ../thunar-volman/tvm-block-device.c:205 -#, fuzzy msgid "Photos were found on your portable music player" -msgstr "Në luajtësin tuaj mbartshëm të muzikës u gjetën foto." +msgstr "" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -93,9 +94,8 @@ msgstr "Importim Fotosh" #: ../thunar-volman/tvm-block-device.c:274 -#, fuzzy msgid "A photo card has been detected" -msgstr "U zbulua nëj kartë fotosh." +msgstr "" #: ../thunar-volman/tvm-block-device.c:275 msgid "" @@ -190,14 +190,12 @@ msgstr "" #: ../thunar-volman/tvm-block-device.c:824 -#, fuzzy msgid "Audio/Data CD" -msgstr "CD Audio/Të dhënash" +msgstr "" #: ../thunar-volman/tvm-block-device.c:825 -#, fuzzy msgid "The CD in the drive contains both music and files" -msgstr "CD në pajisje përmban edhe muzikë edhe kartela." +msgstr "" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" @@ -213,49 +211,32 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" +msgid "Unknown block device type \"%s\"" msgstr "" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" +msgid "Device type \"%s\" not supported" msgstr "" -#: ../thunar-volman/tvm-input-device.c:74 -#, fuzzy -msgid "input-keyboard" -msgstr "Tastiera" - #: ../thunar-volman/tvm-input-device.c:75 -#, fuzzy msgid "Keyboard detected" -msgstr "Tastiera" +msgstr "" #: ../thunar-volman/tvm-input-device.c:76 -#, fuzzy msgid "A keyboard was detected" -msgstr "U zbulua nëj kartë fotosh." - -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" msgstr "" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 -#, fuzzy msgid "Tablet detected" -msgstr "U zbulua aftësi Vetëxhirimi" +msgstr "" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" msgstr "" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "" @@ -266,7 +247,7 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" +msgid "Unsupported input device type \"%s\"" msgstr "" #: ../thunar-volman/tvm-run.c:171 @@ -279,9 +260,8 @@ msgstr "" #: ../thunar-volman/tvm-run.c:190 -#, fuzzy msgid "You have inserted a blank DVD." -msgstr "Keni futur një disk bosh." +msgstr "" #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -292,24 +272,20 @@ msgstr "" #: ../thunar-volman/tvm-run.c:200 -#, fuzzy msgid "Blank CD inserted" -msgstr "Zbardhje CD-sh dhe DVD-sh" +msgstr "" #: ../thunar-volman/tvm-run.c:201 -#, fuzzy msgid "You have inserted a blank CD." -msgstr "Keni futur një disk bosh." +msgstr "" #: ../thunar-volman/tvm-run.c:204 -#, fuzzy msgid "Burn _Data CD" -msgstr "Krijo CD të _Dhënash" +msgstr "" #: ../thunar-volman/tvm-run.c:205 -#, fuzzy msgid "Burn _Audio CD" -msgstr "Krijo CD _Audio" +msgstr "" #: ../thunar-volman/tvm-run.c:229 #, c-format @@ -326,9 +302,8 @@ msgstr "" #: ../thunar-volman/tvm-usb-device.c:63 -#, fuzzy msgid "A photo camera was detected" -msgstr "U zbulua nëj kartë fotosh." +msgstr "" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" @@ -340,16 +315,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" +msgid "Unsupported USB device type \"%s\"" msgstr "" #. setup application name #: ../thunar-volman-settings/main.c:52 -#, fuzzy msgid "Thunar Volume Manager Settings" -msgstr "Përgjegjësi i Volumit Thunar" +msgstr "" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Media dhe Pajisje të Heqshme" @@ -382,9 +356,8 @@ msgid "Shell Scripts" msgstr "Programthe Shell" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Depozitim" @@ -429,9 +402,8 @@ msgid "Command for A_udio CDs:" msgstr "Urdhër për CD _AUDIO:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" @@ -475,9 +447,8 @@ msgid "Play _music files when connected" msgstr "Luaj kartela _muzike kur lidhet" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Aparate Fotografikë" @@ -490,9 +461,8 @@ msgid "Import digital photographs when connected" msgstr "Importo foto shifrore kur lidhet" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA-ra" @@ -513,9 +483,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "Njëkohëso pajisje Pocket P_C kur lidhen të tilla " -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -525,9 +494,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "Xhiro vetvetiu një program kur lidhet një _shtypës" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Pajisje Futjeje " @@ -537,18 +505,16 @@ msgstr "Tastiera" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "Xhiro vetvetiu një program kur lidhet një _tastierë USB" +msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Minj" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" -msgstr "Xhiro vetvetiu një program kur lidhet një _mi USB" +msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -565,60 +531,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Dështoi në hapjen e shfletuesit të dokumentacionit" - -#~ msgid "Failed to open display" -#~ msgstr "Dështoi në hapje ekrani" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Ekipi zhvillues i Thunar-it. Tërë të drejtat të rezervuara." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Shkruar nga Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "UDI \"%s\" e dhënë nuk është pajisje e vlefshme HAL UDI" - -#~ msgid "Encrypted volume" -#~ msgstr "Vëllim i koduar" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Po montohet vëllim i koduar..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Po rregullon shtresën e kodimit..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Nuk keni privilegje për të rregulluar shtresën e kodimit" - -#~ msgid "Wrong password" -#~ msgstr "Fjalëkalim i gabuar" - -#~ msgid "Wrong password." -#~ msgstr "Fjalëkalim i gabuar." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "Ky vëllim është i koduar." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "" -#~ "Ju lutem jepni fjalëkalimin tuaj për çkodimin dhe montimin e vëllimit." - -#~ msgid "_Mount" -#~ msgstr "_Montoje" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Dështoi në rregullimin e vëllimit të koduar" - -#~ msgid "Choose Disc Type" -#~ msgstr "Zgjidhni Tip Disku" - -#~ msgid "Make _DVD" -#~ msgstr "Krijo _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Media të Heqshme" diff -Nru thunar-volman-0.6.1/po/sr.po thunar-volman-0.8.1/po/sr.po --- thunar-volman-0.6.1/po/sr.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/sr.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,534 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# MirosNik , 2012 +# salepetronije , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-21 21:28+0000\n" +"Last-Translator: salepetronije \n" +"Language-Team: Serbian (http://www.transifex.com/projects/p/xfce/language/sr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "Путања новог придодатог уређаја на систему датотека" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "Подесите управљање измењивим уређајима и дисковима" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "Исписује податке о издању и излази" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "Тунаров управник волуменима" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "Сва права су задржана." + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Молим пријавите грешке на <%s>." + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "Нема уређаја са системском путањом „%s“" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "Потребно је навести системску путању нових уређаја са „--device-added“" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "Фотографије и музика" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "Пронађене су фотографије на вашем преносивом музичком уређају" + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "Да ли бисте желели да увезете фотографије или да управљате музиком?" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "Занема_ри" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "Увези _фотографије" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "Управљај _музиком" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "Увоз фотографија" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "Откривена је картица са фотографијама" + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "Постоје фотографије на картици. Да ли бисте желели да их додате у ваш фотоалбум?" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "Да ли желите да дозволите покретање „%s“?" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "Потврда за самопокретање" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "Откривена је способност самопокретања" + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "Дозво_ли самопокретање" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "Да ли желите да отворите „%s“?" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "Потврда за самоотварање" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "Откривена је способност за самоотварање" + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "_Отвори" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "ЦД је прикачен" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "ДВД је прикачен" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "ЦД је прикачен самостално" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "ДВД је прикачен самостално" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "Уређај је прикачен" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "Уређај „%s“ је прикачен самостално" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "Убачени волумен је прикачен самостално" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "Не могу да нађем тачку монтирања" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "Не могу да монтирам уређај" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "Не могу да откријем волумен који одговара уређају" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "ЦД звука/података" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "Диск у фиоци садржи и музику и датотеке" + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "Да ли желите да слушате музику или да разгледате датотеке?" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "Разгледај _датотеке" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "_Пусти ЦД" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "Непозната врста блок уређаја „%s“" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "Врста уређаја „%s“ није подржана" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "Откривена је тастатура" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "Тастатура је откривена" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "Откривена је таблица" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "Графичка таблица је откривена" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "Откривен је миш" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "Миш је откривен" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "Неподржана врста улазног диска „%s“" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "Самонарезивање празних дискова (ЦД и ДВД) је искључено" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "Убачен је празан ДВД" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "Убацили сте празан ДВД." + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "Шта желите да урадите?" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "Нарежи _ДВД" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "Убачен је празан ЦД" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "Убацили сте празан ЦД." + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "Нарежи ЦД _података" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "Направа _музички диск" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "Наредба за резање не може бити празна" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "Није одређена наредба ЦД програма" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "Откривен је фотоапарат" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "Фотоапарат је откривен" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "Откривен је штампач" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "УСБ штампач је откривен" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "Неподржана врста УСБ диска „%s“" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "Подешавања Тунаровог управника волуменима" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "Измењиви дискови и медији" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "Изаберите програм" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "Све датотеке" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "Извршне датотеке" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "Перл скрипте" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "Питон скрипте" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "Руби скрипте" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "Шел скрипте" + +#. Storage +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "Складиште" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "Уклоњиво складиште" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "При_кључи измењиве дискове у току рада" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "Прикачи измењиве медије по _убацивању" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "Разгледај _медије по убацивању" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "_Сам покрени програме за нове дискове и медије" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "Сам отвори датотеке са нових дискова и медија" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "Празни ЦД и ДВД дискови" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "_Нарежи ЦД или ДВД када се убаци празан диск" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "Наредба за ЦД са _подацима:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "Наредба за _звучни ЦД:" + +#. Multimedia +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "Мултимедија" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "Звучни дискови" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "Пусти _звучни ЦД по убацивању" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "_Наредба:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "Дискови снимака" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "Пусти дискове са _снимцима по убацивању" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "Н_аредба:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "Џепне музичке справице" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "Пусти _музику по прикључењу" + +#. Cameras +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "Фотоапарати" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "Дигитални фотоапарати" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "Увези дигиталне фотографије по повезивању" + +#. PDAs +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "Преносни диг. помоћници" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "Усагласи _Palm™ уређаје по прикључивању" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "Џепни рачунари" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "Синхронизуј Џепне _рачунаре по повезивању" + +#. Printers +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "Штампачи" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "Сам покрени програм по прикључивању _штампача" + +#. Input Devices +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "Улазни уређаји" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "Тастатуре" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "Сам покрени програм по прикључивању УСБ _тастатуре" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "Миш" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Сам покрени програм по прикључивању УСБ _миша" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "Таблица" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "Сам покрени програм по прикључивању _таблице" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "_Наредба:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "Не могу да отворим разгледач докумената" diff -Nru thunar-volman-0.6.1/po/sv.po thunar-volman-0.8.1/po/sv.po --- thunar-volman-0.6.1/po/sv.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/sv.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,59 +1,62 @@ -# Swedish translation for thunar-volman. -# Copyright (C) 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the thunar-volman package. -# Daniel Nylander , 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Daniel Nylander , 2008 +# FredN , 2013 +# FredN , 2013 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-07 14:39+0100\n" -"PO-Revision-Date: 2009-12-16 18:21+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-02-23 22:19+0000\n" +"Last-Translator: PavelNicklasson \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/xfce/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -#, fuzzy -msgid "The syfs path of the newly added device" -msgstr "HAL-enhets UDI för nyligen tillagd enhet" +msgid "The sysfs path of the newly added device" +msgstr "Sysfs-sökvägen till den nyligen tillagda enheten" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Konfigurera hanteringen av flyttbara enheter och media" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "Skriv ut versionsinformation och avsluta" +msgstr "Visa versionsinformation och avsluta" #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Volymhanterare för Thunar" -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." -msgstr "" +msgstr "Alla rättigheter reserverade" -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapportera fel till <%s>." -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "" +msgstr "Det finns ingen enhet med sysfs-sökvägen \"%s\"" -#: ../thunar-volman/main.c:202 -#, fuzzy, c-format +#: ../thunar-volman/main.c:188 +#, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "Måste ange ny HAL-enhet UDI med --device-added" +msgstr "Måste ange nya enheters sysfs-sökväg med --device-added" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -62,7 +65,7 @@ #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" -msgstr "Foton hittades på din bärbara musikspelare." +msgstr "Foton hittades på din bärbara musikspelare" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -97,7 +100,9 @@ msgstr "Ett fotokort har upptäckts" #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" msgstr "Det finns foton på kortet. Vill du lägga till dessa foton till ditt fotoalbum?" #. prompt the user to execute the file @@ -184,7 +189,7 @@ #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "" +msgstr "Kunde inte spåra volymen som svarar mot enheten" #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" @@ -192,7 +197,7 @@ #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" -msgstr "Cd-skivan i enheten innehåller både musik och filer" +msgstr "CD-skivan i enheten innehåller både musik och filer" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" @@ -204,22 +209,17 @@ #: ../thunar-volman/tvm-block-device.c:831 msgid "_Play CD" -msgstr "Spela _upp cd-skiva" +msgstr "Spela _upp CD-skiva" #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Okänd blockenhetstyp" +msgid "Unknown block device type \"%s\"" +msgstr "Okänd blockenhetstyp \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Enhetstypen stöds inte" - -#: ../thunar-volman/tvm-input-device.c:74 -#, fuzzy -msgid "input-keyboard" -msgstr "Tangentbord" +msgid "Device type \"%s\" not supported" +msgstr "Enhetstypen \"%s\" stöds inte" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -229,24 +229,15 @@ msgid "A keyboard was detected" msgstr "Ett tangentbord upptäcktes" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" -msgstr "Ritbräda upptäcktes" +msgstr "Ritplatta upptäcktes" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "En ritbräda upptäcktes" - -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" +msgstr "En ritplatta upptäcktes" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" @@ -258,13 +249,13 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Typ av inmatningsenhet stöds inte" +msgid "Unsupported input device type \"%s\"" +msgstr "Inmatningsenhetstypen \"%s\" stöds inte" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "" +msgstr "Autobränning av tomma CD-och DVD-skivor är inaktiverat" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" @@ -292,11 +283,11 @@ #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" -msgstr "Bränn _data-cd" +msgstr "Bränn _data-CD" #: ../thunar-volman/tvm-run.c:205 msgid "Burn _Audio CD" -msgstr "Bränn _ljud-cd" +msgstr "Bränn _ljud-CD" #: ../thunar-volman/tvm-run.c:229 #, c-format @@ -326,15 +317,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "USB-enhetstypen stöds inte" +msgid "Unsupported USB device type \"%s\"" +msgstr "USB-enhetstypen \"%s\" stöds inte" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Inställningar för Volymhanterare för Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Flyttbara enheter och media" @@ -368,7 +359,6 @@ msgstr "Skalskript" #. Storage -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "Lagring" @@ -399,33 +389,32 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" -msgstr "Tomma cd- och dvd-skivor" +msgstr "Tomma CD- och DVD-skivor" #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" -msgstr "_Bränn en cd eller dvd när en tom skiva matas in" +msgstr "_Bränn en CD eller DVD när en tom skiva matas in" #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" -msgstr "Kommando för _data-cd:" +msgstr "Kommando för _data-CD:" #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "Kommando för l_jud-cd:" +msgstr "Kommando för l_jud-CD:" #. Multimedia -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "Multimedia" #: ../thunar-volman-settings/tvm-preferences-dialog.c:266 msgid "Audio CDs" -msgstr "Ljud-cd" +msgstr "Ljud-CD" #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "Spela upp _ljud-cd när inmatad" +msgstr "Spela upp _ljud-CD när inmatad" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -437,11 +426,11 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:304 msgid "Video CDs/DVDs" -msgstr "Video-cd/dvd" +msgstr "Video-CD/DVD" #: ../thunar-volman-settings/tvm-preferences-dialog.c:321 msgid "Play _video CDs and DVDs when inserted" -msgstr "Spela upp _video-cd och dvd när inmatade" +msgstr "Spela upp _video-CD och DVD när inmatade" #: ../thunar-volman-settings/tvm-preferences-dialog.c:329 #: ../thunar-volman-settings/tvm-preferences-dialog.c:367 @@ -459,7 +448,6 @@ msgstr "Spela upp _musikfiler när ansluten" #. Cameras -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "Kameror" @@ -473,7 +461,6 @@ msgstr "Importera digitalfoton när ansluten" #. PDAs -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "Handdatorer" @@ -495,7 +482,6 @@ msgstr "Synkronisera Pocket P_C-enheter när anslutna" #. Printers -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -506,7 +492,6 @@ msgstr "Kör automatiskt ett program när en _skrivare ansluts" #. Input Devices -#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "Inmatningsenheter" @@ -516,24 +501,24 @@ msgstr "Tangentbord" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid "Automatically run a program when an USB _keyboard is connected" -msgstr "Kör automatiskt ett program när ett USB-_tangentbord ansluts" +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "Kör ett program automatiskt när ett USB-_tangentbord är anslutet" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Möss" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid "Automatically run a program when an USB _mouse is connected" -msgstr "Kör automatiskt ett program när en USB-_mus ansluts" +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "Kör ett program automatiskt när en USB-_mus är ansluten" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" -msgstr "Ritbord" +msgstr "Ritplatta" #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "Kör automatiskt ett program när ett _ritbord ansluts" +msgstr "Kör automatiskt ett program när en _ritplatta ansluts" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" @@ -542,54 +527,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Misslyckades med att öppna dokumentationsvisaren" - -#~ msgid "Failed to open display" -#~ msgstr "Misslyckades med att öppna display" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "The Thunar development team. Alla rättigheter är reserverade." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Skrivet av Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Angivet UDI \"%s\" är inte en giltig HAL-enhets UDI" - -#~ msgid "Encrypted volume" -#~ msgstr "Krypterad volym" - -#~ msgid "Mounting encrypted volume..." -#~ msgstr "Monterar krypterad volym..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Konfigurerar krypteringslagret..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Du är inte behörig att konfigurera krypteringslagret" - -#~ msgid "Wrong password" -#~ msgstr "Felaktigt lösenord" - -#~ msgid "Wrong password." -#~ msgstr "Felaktigt lösenord." - -#~ msgid "This volume is encrypted." -#~ msgstr "Denna volym är krypterad." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Ange ditt lösenord för att dekryptera och montera volymen." - -#~ msgid "_Mount" -#~ msgstr "_Montera" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Misslyckades med att konfigurera den krypterade volymen" - -#~ msgid "Choose Disc Type" -#~ msgstr "Välj skivtyp" - -#~ msgid "Make _DVD" -#~ msgstr "Skapa _dvd" - -#~ msgid "Removable Media" -#~ msgstr "Flyttbart media" diff -Nru thunar-volman-0.6.1/po/te.po thunar-volman-0.8.1/po/te.po --- thunar-volman-0.6.1/po/te.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/te.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,28 +1,29 @@ -# Xfce Telugu Translation. -# Copyright (C) 2011 Telugu Linux Development Team. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Praveen Illa , 2011. # +# Translators: +# ప్రవీణ్ ఇళ్ళ , 2011 msgid "" msgstr "" -"Project-Id-Version: thunar-volman.master\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-11 17:39+0000\n" -"PO-Revision-Date: 2011-07-13 20:13+0530\n" -"Last-Translator: Praveen Illa \n" -"Language-Team: Telugu \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Telugu (http://www.transifex.com/projects/p/xfce/language/te/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" +"Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" +msgid "The sysfs path of the newly added device" msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "" @@ -36,21 +37,21 @@ msgid "Thunar Volume Manager" msgstr "తునార్ సంపుట నిర్వాహకము" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "అన్ని హక్కులు కేటాయించబడినవి." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "దయచేసి బగ్‌లను <%s>కు నివేదించండి." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "" @@ -210,13 +211,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "తెలియని బ్లాక్ పరికర రకం" +msgid "Unknown block device type \"%s\"" +msgstr "" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "పరికరము రకము సహకరించుటలేదు" +msgid "Device type \"%s\" not supported" +msgstr "" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -246,8 +247,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "సహకారము లేని ఇన్‌పుట్ పరికరము రకం" +msgid "Unsupported input device type \"%s\"" +msgstr "" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -314,15 +315,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "సహకారము లేని USB పరికర రకము" +msgid "Unsupported USB device type \"%s\"" +msgstr "" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "తునార్ సంపుట నిర్వాహకము అమరికలు" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "తీసివేయదగిన డ్రైవులు మరియు మాధ్యమం" @@ -530,12 +531,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "పత్రీకరణ విహారిణిని తెరుచుటలో విఫలమైంది" - -#~ msgid "input-keyboard" -#~ msgstr "ఇన్‌పుట్-కీబోర్డు" - -#~ msgid "input-tablet" -#~ msgstr "ఇన్‌పుట్-టాబ్లెట్" - -#~ msgid "input-mouse" -#~ msgstr "ఇన్‌పుట్-మౌస్" diff -Nru thunar-volman-0.6.1/po/th.po thunar-volman-0.8.1/po/th.po --- thunar-volman-0.6.1/po/th.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/th.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,533 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Theppitak Karoonboonyanan , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-04 14:11+0000\n" +"Last-Translator: theppitak \n" +"Language-Team: Thai (http://www.transifex.com/projects/p/xfce/language/th/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: th\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "พาธ sysfs ของอุปกรณ์ที่เพิ่มเข้ามาใหม่" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "ตั้งค่าการจัดการไดรว์และสื่อถอดเสียบ" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "แสดงข้อมูลรุ่นแล้วจบโปรแกรม" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "ส่วนขยายจัดการโวลุมสำหรับ Thunar" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "All rights reserved." + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "หากพบปัญหา กรุณารายงานไปที่ <%s>" + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "ไม่มีอุปกรณ์ที่มีพาธ sysfs เป็น \"%s\"" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "ต้องระบุพาธ sysfs ของอุปกรณ์ชิ้นใหม่ด้วยตัวเลือก --device-added" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "ภาพถ่ายและเพลง" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "พบภาพถ่ายในเครื่องเล่นเพลงพกพาของคุณ" + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "คุณต้องการจะนำเข้าภาพถ่ายหรือจัดการเพลง?" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "ไ_ม่สนใจ" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "นำเข้า_ภาพถ่าย" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "จัดการเ_พลง" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "การนำเข้าภาพถ่าย" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "ตรวจพบการ์ดเก็บภาพถ่าย" + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "มีภาพถ่ายอยู่ในการ์ด คุณต้องการเพิ่มภาพถ่ายเหล่านี้เข้าในอัลบั้มของคุณหรือไม่?" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "คุณจะอนุญาตให้ \"%s\" ทำงานหรือไม่?" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "การยืนยัน Auto-Run" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "ตรวจพบการรองรับ Auto-Run" + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "_อนุญาต Auto-Run" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "คุณต้องการเปิด \"%s\" หรือไม่?" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "ยืนยันการเิปิดอัตโนมัติ" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "ตรวจพบการรองรับการเปิดอัตโนมัติ" + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "_เปิด" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "เมานท์ซีดีแล้ว" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "เมานท์ดีวีดีแล้ว" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "เมานท์ซีดีแล้วโดยอัตโนมัติ" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "เมานท์ดีวีดีแล้วโดยอัตโนมัติ" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "เมานท์โวลุมแล้ว" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "เมานท์โวลุม \"%s\" แล้วโดยอัตโนมัติ" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "เมานท์โวลุมที่ใส่เข้ามาแล้วโดยอัตโนมัติ" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "หาจุดเมานท์ไม่พบ" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "ไม่สามารถเมานท์อุปกรณ์" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "ตรวจไม่พบโวลุมที่ตรงกับอุปกรณ์" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "ซีดีเพลง/ข้อมูล" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "ซีดีในไดรว์มีทั้งเพลงและแฟ้มข้อมูล" + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "คุณต้องการจะฟังเพลงหรือท่องดูแฟ้มต่างๆ?" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "_ท่องดูแฟ้ม" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "เ_ล่นซีดี" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "ไม่รู้จักชนิดอุปกรณ์ \"%s\"" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "ไม่รองรับอุปกรณ์ชนิด \"%s\"" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "ตรวจพบแป้นพิมพ์" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "ตรวจพบแป้นพิมพ์" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "ตรวจพบแท็บเล็ต" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "ตรวจพบแท็บเล็ตสำหรับงานกราฟิกส์" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "ตรวจพบเมาส์" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "ตรวจพบเมาส์" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "พบชนิดอุปกรณ์ \"%s\" ที่ไม่รองรับ" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "การเขียนซีดีและดีวีดีเปล่าโดยอัตโนมัติถูกปิดไว้" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "มีแผ่นดีวีดีเปล่าใส่เข้ามา" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "คุณได้ใส่แผ่นดีวีดีเปล่าเข้ามา" + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "คุณต้องการทำสิ่งไหน?" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "เ_ขียนดีวีดี" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "มีแผ่นซีดีเปล่าใส่เข้ามา" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "คุณได้ใส่แผ่นซีดีเปล่าเข้ามา" + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "เขียนซีดี_ข้อมูล" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "เขียนซีดีเ_พลง" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "คำสั่งสำหรับเขียนแผ่นจะว่างเปล่าไม่ได้" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "ไม่ได้กำหนดคำสั่งสำหรับเรียกโปรแกรมเล่นซีดีไว้" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "ตรวจพบกล้องถ่ายรูป" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "ตรวจพบกล้องถ่ายรูป" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "ตรวจพบเครื่องพิมพ์" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "ตรวจพบเครื่องพิมพ์ USB" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "พบชนิดอุปกรณ์ USB \"%s\" ที่ไม่รองรับ" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "ตั้งค่าส่วนขยายจัดการโวลุมของ Thunar" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "ไดรว์และสื่อถอดเสียบ" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "เลือกโปรแกรม" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "ทุกแฟ้ม" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "แฟ้มที่เรียกทำงานได้" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "สคริปต์ Perl" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "สคริปต์ Python" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "สคริปต์ Ruby" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "เชลล์สคริปต์" + +#. Storage +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "แหล่งเก็บข้อมูล" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "แหล่งเก็บถอดเสียบ" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "เ_มานท์ไดรว์ถอดเสียบเมื่อเชื่อมต่อขณะระบบทำงาน" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "เมานท์_สื่อถอดเสียบเมื่อใส่เข้ามา" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "_ท่องดูสื่อถอดเสียบเมื่อใส่เข้ามา" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "เ_รียกโปรแกรม Auto-run ในไดรว์และสื่อที่ใส่เข้ามาใหม่" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "เปิดแฟ้มต่างๆ ในไดรว์และสื่อที่ใส่เข้ามาใหม่โดยอัตโนมัติ" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "ซีดีและดีวีดีเปล่า" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "เ_ขียนซีดีหรือดีวีดีเมื่อมีการใส่แผ่นเปล่าเข้ามา" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "คำสั่งสำหรับซีดีข้อมู_ล:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "คำสั่งสำหรับซีดีเ_พลง:" + +#. Multimedia +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "สื่อผสม" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "ซีดีเพลง" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "เล่นซีดีเ_พลงเมื่อใส่เข้ามา" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "_คำสั่ง:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "ซีดีและดีวีดีภาพยนตร์" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "เล่นซีดีและดีวีดี_ภาพยนตร์เมื่อใส่เข้ามา" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "คำ_สั่ง:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "เครื่องเล่นเพลงพกพา" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "เล่นแ_ฟ้มเพลงต่างๆ เมื่อใส่เข้ามา" + +#. Cameras +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "กล้องถ่ายรูป" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "กล่องดิจิทัล" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "นำเข้าภาพถ่ายดิจิทัลเมื่อใส่เข้ามา" + +#. PDAs +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "PDA" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "ปาล์ม" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "ปรับโอนข้อมูลกับอุปกรณ์_ปาล์มเมื่อมีการเชื่อมต่อ" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "พ็อกเก็ตพีซี" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "ปรับโอนข้อมูลกับอุปกรณ์_พ็อกเก็ตพีซีเมื่อมีการเชื่อมต่อ" + +#. Printers +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "เครื่องพิมพ์" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "เรียกทำงานโปรแกรมโดยอัตโนมัติเมื่อมีการเชื่อมต่อเครื่อง_พิมพ์" + +#. Input Devices +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "อุปกรณ์ป้อนข้อมูล" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "แป้นพิมพ์" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "เรียกทำงานโปรแกรมโดยอัตโนมัติเมื่อมีการเชื่อมต่อแ_ป้นพิมพ์" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "เมาส์" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "เรียกทำงานโปรแกรมโดยอัตโนมัติเมื่อมีการเชื่อมต่อเ_มาส์" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "แท็บเล็ต" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "เรียกทำงานโปรแกรมโดยอัตโนมัติเมื่อมีการเชื่อมต่อแ_ท็บเล็ต" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "คำสั่_ง:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "เปิดโปรแกรมท่องอ่านเอกสารไม่สำเร็จ" diff -Nru thunar-volman-0.6.1/po/tr.po thunar-volman-0.8.1/po/tr.po --- thunar-volman-0.6.1/po/tr.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/tr.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,24 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Fatih Erdem <93.fatiherdem@gmail.com>, 2013 +# volkangezer , 2013 msgid "" msgstr "" -"Project-Id-Version: Thunar volman plugin\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-19 11:15+0000\n" -"PO-Revision-Date: \n" -"Last-Translator: Samed Beyribey \n" -"Language-Team: Xfce TR \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-30 12:34+0000\n" +"Last-Translator: Fatih Erdem <93.fatiherdem@gmail.com>\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/xfce/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" -"X-Poedit-Country: TURKEY\n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Yeni eklenen aygıtın HAL aygıt UDI değeri" +msgid "The sysfs path of the newly added device" +msgstr "Yeni eklenmiş cihazın syspath'i" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Kaldırılabilir sürücü ve ortam yönetimi yapılandırması" @@ -32,24 +38,24 @@ msgid "Thunar Volume Manager" msgstr "Thunar Birim Yöneticisi" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Tüm hakları saklıdır." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Hataları lütfen <%s> adresine bildirin." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "\"%s\" dizininde bir sürücü bulunamadı." -#: ../thunar-volman/main.c:186 -#, fuzzy, c-format +#: ../thunar-volman/main.c:188 +#, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "Yeni HAL aygıt UDI değeri --device-added ile belirtilmelidir" +msgstr "Yeni aygıtların sysfs yolu --device-added ile belirtilmelidir" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -96,9 +102,7 @@ msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"Kart üzerinde fotoğraflar bulundu. Bu fotoğrafları albüme aktarmak ister " -"misiniz?" +msgstr "Kart üzerinde fotoğraflar bulundu. Bu fotoğrafları albüme aktarmak ister misiniz?" #. prompt the user to execute the file #. prompt the user to execute this file @@ -167,7 +171,7 @@ msgstr "\"%s\" birimi otomaitk olarak bağlandı" #: ../thunar-volman/tvm-block-device.c:640 -#, fuzzy, c-format +#, c-format msgid "The inserted volume was mounted automatically" msgstr "Eklenen birim otomatik olarak bağlandı" @@ -182,7 +186,7 @@ msgstr "Sürücü bağlanamıyor" #: ../thunar-volman/tvm-block-device.c:749 -#, fuzzy, c-format +#, c-format msgid "Could not detect the volume corresponding to the device" msgstr "Aygıta karşılık gelen birim bulunamadı" @@ -208,13 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Bilinmeyen sürücü tipi" +msgid "Unknown block device type \"%s\"" +msgstr "Bilinmeyen blok aygıt türü \"%s\"" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Desteklenmeyen sürücü türü" +msgid "Device type \"%s\" not supported" +msgstr "\"%s\" aygıt türü desteklenmiyor" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -244,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Desteklenmeyen giriş birimi türü" +msgid "Unsupported input device type \"%s\"" +msgstr "\"%s\" girdi aygıt türü desteklenmiyor" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -312,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Desteklenmeyen USB sürücü türü" +msgid "Unsupported USB device type \"%s\"" +msgstr "\"%s\" USB aygıt türü desteklenmiyor" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunar Birim Yöneticisi Ayarları" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Kaldırılabilir Sürücüler ve Ortam" @@ -502,18 +506,16 @@ msgstr "Klavyeler" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "USB _klavye bağlandığında uygulama çalıştır" +msgstr "USB _klavye bağlandığında otomatik bir uygulama çalıştır" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "Fare" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" -msgstr "USB fare bağlandığında uygula_ma çalıştır" +msgstr "USB _fare bağlandığında otomatik bir uygulama çalıştır" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -530,67 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "Doküman tarayıcı açılamadı" - -#~ msgid "input-keyboard" -#~ msgstr "Klavyeler" - -#~ msgid "input-tablet" -#~ msgstr "input-tablet" - -#~ msgid "input-mouse" -#~ msgstr "Fare" - -#~ msgid "Failed to open display" -#~ msgstr "Ekran açılamadı" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Thunar geliştirici takımı. Tüm hakları saklıdır." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Benedikt Meurer tarafından yazılmıştır ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Belirtilen UDI \"%s\" geçerli bir HAL aygıt UDI değeri değil" - -#~ msgid "Encrypted volume" -#~ msgstr "Şifrelenmiş birim" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Şifrelenmiş birim bağlanıyor..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Şifre katmanı ayarlanıyor..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Şifre katmanı ayarlamak için yetkiniz bulunmamaktadır" - -#~ msgid "Wrong password" -#~ msgstr "Yanlış parola" - -#~ msgid "Wrong password." -#~ msgstr "Yanlış parola." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "Bu birim şifrelenmiş." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Lütfen şifreyi çözmek ve birimi bağlamak için parolanızı yazın." - -#~ msgid "_Mount" -#~ msgstr "_Bağla" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Şifrelenmiş birim ayarlanamadı" - -#~ msgid "Choose Disc Type" -#~ msgstr "Disk Türünü Seçin" - -#~ msgid "Make _DVD" -#~ msgstr "_DVD Oluştur" - -#~ msgid "Removable Media" -#~ msgstr "Kaldırılabilir Ortam" diff -Nru thunar-volman-0.6.1/po/ug.po thunar-volman-0.8.1/po/ug.po --- thunar-volman-0.6.1/po/ug.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ug.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,31 +1,32 @@ -# Uyghur translations for thunar-volman package -# Copyright (C) 2008 Benedikt Meurer -# This file is distributed under the same license as the PACKAGE package. -# Gheyret T.Kenji , 2010 -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# kawichi, 2013 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2008-11-09 14:59+0900\n" -"Last-Translator: Gheyret T.Kenji \n" -"Language-Team: Uyghur Computer Science Association \n" -"Language: ja\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-12-26 02:53+0000\n" +"Last-Translator: kawichi\n" +"Language-Team: Uighur (http://www.transifex.com/projects/p/xfce/language/ug/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ug\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "" +msgid "The sysfs path of the newly added device" +msgstr "يېڭى قوشۇلغان ئۈسكۈنىدىكى sysfs نىڭ يولى" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" -msgstr "" +msgstr "يۆتكەلمە ئۈسكۈنە ۋە ۋاسىتىلەرنى سەپلەش ۋە باشقۇرۇش" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" @@ -34,26 +35,26 @@ #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Thunar Volume باشقۇرغۇ" +msgstr "سۇنار(Thunar) دىسكا باشقۇرغۇ" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." -msgstr "بارلىق ھوقۇقنى ساقلاپ قالىدۇ." +msgstr "بارلىق ھوقۇق ئۆزىمىزگە تەۋە." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "كەمتۈكنى <%s> غا دوكلات قىلىڭ." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" -msgstr "" +msgstr "بۇ يەردە sysfs يولى «%s» بولغان ئۈسكۈنە يوق" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "" +msgstr "يېڭى ئۈسكۈنىنىڭ sysfs يولىنى --device-added ئارقىلىق كۆرسىتىپ بېرىش كېرەك" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -62,7 +63,7 @@ #: ../thunar-volman/tvm-block-device.c:205 msgid "Photos were found on your portable music player" -msgstr "ئەپلىك چالغۇڭىزدا سۈرەت بار ئىكەن" +msgstr "ئەپلىك مۇزىكا قويغۇدا سۈرەت بار ئىكەن" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -94,13 +95,13 @@ #: ../thunar-volman/tvm-block-device.c:274 msgid "A photo card has been detected" -msgstr "سۈرەت كارتىسى ئۆچۈرۈلگەن" +msgstr "سۈرەت كارتىسى بايقالدى" #: ../thunar-volman/tvm-block-device.c:275 msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" +msgstr "كارتىدا سۈرەتلەر بار ئىكەن. بۇ سۈرەتلەرنى ئالبومغا قوشامسىز؟" #. prompt the user to execute the file #. prompt the user to execute this file @@ -108,17 +109,17 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "\"%s\" نى ئىجرا قىلىشقا يول قويامسىز؟" +msgstr "«%s» نى ئىجرا قىلىشقا يول قويامسىز؟" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 msgid "Auto-Run Confirmation" -msgstr "ئۆزلۈكىدىن ئىجرا قىلىشنى جەزملە" +msgstr "ئۆزلۈكىدىن ئىجرا قىلىشنى جەزملەش" #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid "Auto-Run capability detected" -msgstr "ئۆزلۈكىدىن ئىجرا قىلىدىكەن" +msgstr "ئۆزلۈكىدىن ئىجرا قىلىش بايقالدى" #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 @@ -129,15 +130,15 @@ #: ../thunar-volman/tvm-block-device.c:502 #, c-format msgid "Would you like to open \"%s\"?" -msgstr "\"%s\" نى ئاچامسىز؟" +msgstr "«%s» نى ئاچامسىز؟" #: ../thunar-volman/tvm-block-device.c:505 msgid "Auto-Open Confirmation" -msgstr "ئۆزلۈكىدىن ئېچىشنى جەزملە" +msgstr "ئۆزلۈكىدىن ئېچىشنى جەزملەش" #: ../thunar-volman/tvm-block-device.c:506 msgid "Auto-Open capability detected" -msgstr "ئۆزلۈكىدىن ئېچىلىدىكەن" +msgstr "ئۆزلۈكىدىن ئېچىلىش بايقالدى" #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" @@ -145,56 +146,56 @@ #: ../thunar-volman/tvm-block-device.c:619 msgid "CD mounted" -msgstr "CD mount قىلىندى" +msgstr "پلاستىنكا(CD) ئېگەرلەندى" #: ../thunar-volman/tvm-block-device.c:619 msgid "DVD mounted" -msgstr "DVD mount قىلىندى" +msgstr "پلاستىنكا(DVD) ئېگەرلەندى" #: ../thunar-volman/tvm-block-device.c:621 msgid "The CD was mounted automatically" -msgstr "CD ئۆزلۈكىدىن mount قىلىنىپتۇ" +msgstr "بۇ پلاستىنكا(CD) ئۆزلۈكىدىن ئېگەرلەندى" #: ../thunar-volman/tvm-block-device.c:622 msgid "The DVD was mounted automatically" -msgstr "DVD ئۆزلۈكىدىن mount قىلىنىپتۇ" +msgstr "بۇ پلاستىنكا(DVD) ئۆزلۈكىدىن ئېگەرلەندى" #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "Volume mount قىلىندى" +msgstr "دىسكا ئېگەرلەندى" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "volume \"%s\" ئۆزلۈكىدىن mount قىلىنىپتۇ" +msgstr "بۇ دىسكا «%s» ئۆزلۈكىدىن ئېگەرلەندى" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "سېلىنغان volume ئۆزلۈكىدىن mount قىلىنىپتۇ" +msgstr "سېلىنغان دىسكا ئۆزلۈكىدىن ئېگەرلەندى" #: ../thunar-volman/tvm-block-device.c:694 #, c-format msgid "Unable to locate mount point" -msgstr "mount نۇقتىسىنى بېكىتكىلى بولمىدى" +msgstr "ئېگەرلەش نۇقتىسىنى بېكىتكىلى بولمىدى" #: ../thunar-volman/tvm-block-device.c:740 #, c-format msgid "Unable to mount the device" -msgstr "ئۈسكۈنىنى mount قىلغىلى بولمىدى" +msgstr "ئۈسكۈنىنى ئېگەرلىگىلى بولمىدى" #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "ئۈسكىنىگە ماس كېلىدىغان volume تېپىلمىدى" +msgstr "ئۈسكىنىگە ماس كېلىدىغان دىسكا تېپىلمىدى" #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" -msgstr "ئۈن/سانلىق-ئاساس CD" +msgstr "ئۈن/سانلىق-مەلۇمات پلاستىنكىسى(CD)" #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" -msgstr "قوزغاتقۇچتىكى CD دا مۇزىكا ۋە ھۆججەتلەر بار ئىكەن" +msgstr "قوزغاتقۇچتىكى پلاستىنكىسى(CD)دا مۇزىكا ۋە ھۆججەتلەر بار ئىكەن" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" @@ -202,25 +203,21 @@ #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" -msgstr "ھۆججەتلەرنى كور(_B)" +msgstr "ھۆججەتلەرنى كۆرىمەن(_B)" #: ../thunar-volman/tvm-block-device.c:831 msgid "_Play CD" -msgstr "CD نى چال(_P)" +msgstr "پلاستىنكىسى(CD) نى ئاڭلايمەن(_P)" #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "نامەلۇم block ئۈسكىنە تىپى" +msgid "Unknown block device type \"%s\"" +msgstr "نامەلۇم بۆلەك ئۈسكۈنە تىپى «%s»" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "ئۈسكىنە تىپىنى بىر تەرەپ قىلالمايدۇ" - -#: ../thunar-volman/tvm-input-device.c:74 -msgid "input-keyboard" -msgstr "كىرگۇزۇش-ھەرپتاختا" +msgid "Device type \"%s\" not supported" +msgstr "ئۈسكۈنە تىپى «%s» نى قوللىمايدۇ" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -230,24 +227,15 @@ msgid "A keyboard was detected" msgstr "بىر ھەرپتاختا تېپىلدى" -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" -msgstr "كىرگۈزۈش-tablet" - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid "Tablet detected" -msgstr "Tablet تېپىلدى" +msgstr "سەزگۈر تاختا(Tablet) تېپىلدى" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" -msgstr "گرافىكىلىق Tablet تېپىلدى" - -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "كىرگۈزۈش-چاشقىنەك" +msgstr "گرافىكىلىق سەزگۈر تاختا(Tablet) تېپىلدى" #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" @@ -259,86 +247,86 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "تونۇمايدىغان كىرگۈزۈش ئۈسكىنە تىپى" +msgid "Unsupported input device type \"%s\"" +msgstr "قوللىمايدىغان كىرگۈزۈش ئۈسكۈنە تىپى «%s»" #: ../thunar-volman/tvm-run.c:171 #, c-format msgid "Autoburning of blank CDs and DVDs is disabled" -msgstr "CD ياكى DVD غا ئۆزلۈكىدىن يېزىش چەكلەنگەن" +msgstr "پلاستىنكا(CD) ياكى پلاستىنكا(DVD) غا ئۆزلۈكىدىن يېزىش چەكلەنگەن" #: ../thunar-volman/tvm-run.c:189 msgid "Blank DVD inserted" -msgstr "قۇرۇق DVD سېلىندى" +msgstr "قۇرۇق پلاستىنكا(DVD) سېلىندى" #: ../thunar-volman/tvm-run.c:190 msgid "You have inserted a blank DVD." -msgstr "" +msgstr "قۇرۇق پلاستىنكا(DVD) سېلىپسىز." #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" -msgstr "何をしますか?" +msgstr "نېمە قىلغۇڭىز بار؟" #: ../thunar-volman/tvm-run.c:193 msgid "Burn _DVD" -msgstr "" +msgstr "پلاستىنكا(DVD) غا يازىمەن(_D)" #: ../thunar-volman/tvm-run.c:200 msgid "Blank CD inserted" -msgstr "" +msgstr "قۇرۇق پلاستىنكا(CD) سېلىندى" #: ../thunar-volman/tvm-run.c:201 msgid "You have inserted a blank CD." -msgstr "" +msgstr "قۇرۇق پلاستىنكا(CD) سېلىپسىز." #: ../thunar-volman/tvm-run.c:204 msgid "Burn _Data CD" -msgstr "" +msgstr "پلاستىنكا(CD) غا سانلىق-مەلۇمات يازىمەن(_D)" #: ../thunar-volman/tvm-run.c:205 msgid "Burn _Audio CD" -msgstr "" +msgstr "پلاستىنكا(CD) غا مۇزىكا يازىمەن(_D)" #: ../thunar-volman/tvm-run.c:229 #, c-format msgid "The burn command may not be empty" -msgstr "" +msgstr "يېزىش بۇيرۇقى قۇرۇق بولسا بولمايدۇ" #: ../thunar-volman/tvm-run.c:268 #, c-format msgid "The CD player command is undefined" -msgstr "" +msgstr "پلاستىنكا(CD) قويۇش بۇيرۇقى ئېنىق ئەمەس" #: ../thunar-volman/tvm-usb-device.c:62 msgid "Camera detected" -msgstr "" +msgstr "كامېرا بايقالدى" #: ../thunar-volman/tvm-usb-device.c:63 msgid "A photo camera was detected" -msgstr "" +msgstr "بىر دانە كامېرا بايقالدى" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" -msgstr "" +msgstr "پرىنتېر بايقالدى" #: ../thunar-volman/tvm-usb-device.c:72 msgid "A USB printer was detected" -msgstr "" +msgstr "بىر USB پرىنتېرى بايقالدى" #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "" +msgid "Unsupported USB device type \"%s\"" +msgstr "قوللىمايدىغان USB ئۈسكۈنە تىپى «%s»" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "" +msgstr "سۇنار(Thunar) دىسكا باشقۇرغۇ تەڭشەكلىرى" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" -msgstr "Removable ئۈسكىنە ۋە Media" +msgstr "يۆتكىلىشچان ئۈسكۈنە ۋە ۋاسىتە" #: ../thunar-volman-settings/tvm-command-entry.c:240 msgid "Select an Application" @@ -346,7 +334,7 @@ #: ../thunar-volman-settings/tvm-command-entry.c:250 msgid "All Files" -msgstr "ھەممە ھۆججەت" +msgstr "ھەممە ھۆججەتلەر" #: ../thunar-volman-settings/tvm-command-entry.c:255 msgid "Executable Files" @@ -368,67 +356,65 @@ msgid "Shell Scripts" msgstr "Shell پروگراممىسى" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" -msgstr "ساقلاش" +msgstr "ساقلىغۇچ" #: ../thunar-volman-settings/tvm-preferences-dialog.c:141 msgid "Removable Storage" -msgstr "リムーバブルストレージ" +msgstr "يۆتكەلمە ساقلىغۇچ" #: ../thunar-volman-settings/tvm-preferences-dialog.c:158 msgid "_Mount removable drives when hot-plugged" -msgstr "リムーバブルドライブがホットプラグされたらマウントする(_M)" +msgstr "يۆتكەلمە ئۈسكۈنىلەر چېتىلغاندا ئېگەرلىسۇن(_M)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:166 msgid "Mount removable media when _inserted" -msgstr "リムーバブルメディアが挿入されたらマウントする(_I)" +msgstr "يۆتكەلمە ئۈسكۈنىلەر چېتىلغاندا ئېگەرلىسۇن(_I)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:174 msgid "B_rowse removable media when inserted" -msgstr "リムーバブルメディアが挿入されたら参照する(_R)" +msgstr "يۆتكەلمە ئۈسكۈنىلەر چېتىلغاندا مەزمۇنىنى كۆرسەتسۇن(_R)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:182 msgid "_Auto-run programs on new drives and media" -msgstr "新しいドライブおよびメディア上のプログラムを自動実行する(_A)" +msgstr "يېڭى قوزغاتقۇچ ياكى كۆپ ۋاسىتىدىكى پروگراممىنى ئۆزلۈكىدىن ئىجرا قىلسۇن(_A)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:189 msgid "Auto-open files on new drives and media" -msgstr "يېڭى ئۈسكىنە ۋە media دىكى ھۆججەتلەر ئاپتوماتىك ئېچىلسۇن" +msgstr "يېڭى ئۈسكۈنە ۋە ۋاسىتىدىكى ھۆججەتلەر ئاپتوماتىك ئېچىلسۇن" #: ../thunar-volman-settings/tvm-preferences-dialog.c:201 msgid "Blank CDs and DVDs" -msgstr "空の CD および DVD" +msgstr "قۇرۇق CD ۋە DVD پلاستىنكىسى" #: ../thunar-volman-settings/tvm-preferences-dialog.c:218 msgid "_Burn a CD or DVD when a blank disc is inserted" -msgstr "空の CD または DVD が挿入されたらディスクを作成する(_B)" +msgstr "قۇرۇق CD ياكى DVD قىستۇرۇلغاندا يازسۇن(_B)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:229 msgid "Command for _Data CDs:" -msgstr "データ CD 用コマンド(_D)" +msgstr "سانلىق-مەلۇمات CD نىڭ بۇيرۇقى(_D):" #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "オーディオ CD 用コマンド(_U)" +msgstr "ئۈن CD نىڭ بۇيرۇقى(_U):" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" -msgstr "Multimedia" +msgstr "كۆپ ۋاسىتە" #: ../thunar-volman-settings/tvm-preferences-dialog.c:266 msgid "Audio CDs" -msgstr "ئاۋاز چاستوتا CD" +msgstr "ئۈن CD (لار)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:283 msgid "Play _audio CDs when inserted" -msgstr "オーディオ CD が挿入されたら再生する(_A)" +msgstr "ئۈن CD سى قىستۇرۇلغاندا قويسۇن(_A)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:290 #: ../thunar-volman-settings/tvm-preferences-dialog.c:415 @@ -440,45 +426,43 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:304 msgid "Video CDs/DVDs" -msgstr "ビデオ CD/DVD" +msgstr "سىن پلاستىنكىسى(CD/DVD)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:321 msgid "Play _video CDs and DVDs when inserted" -msgstr "ビデオ CD および DVD が挿入されたら再生する(_V)" +msgstr "سىن پلاستىنكىسى(CD/DVD) قىستۇرۇلغاندا قويسۇن(_V)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:329 #: ../thunar-volman-settings/tvm-preferences-dialog.c:367 #: ../thunar-volman-settings/tvm-preferences-dialog.c:505 #: ../thunar-volman-settings/tvm-preferences-dialog.c:640 msgid "C_ommand:" -msgstr "コマンド(_O):" +msgstr "بۇيرۇق(_O):" #: ../thunar-volman-settings/tvm-preferences-dialog.c:343 msgid "Portable Music Players" -msgstr "携帯音楽プレイヤー" +msgstr "ئەپچىل مۇزىكا قويغۇلار" #: ../thunar-volman-settings/tvm-preferences-dialog.c:360 msgid "Play _music files when connected" -msgstr "接続されたら音楽ファイルを再生する(_M)" +msgstr "چېتىلغاندا مۇزىكا ھۆججەتلىرىنى قويسۇن(_M)" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" -msgstr "カメラ" +msgstr "كامېرالار" #: ../thunar-volman-settings/tvm-preferences-dialog.c:390 msgid "Digital Cameras" -msgstr "デジタルカメラ" +msgstr "رەقەملىك كامېرالار" #: ../thunar-volman-settings/tvm-preferences-dialog.c:407 msgid "Import digital photographs when connected" -msgstr "接続されたら写真を取り込む" +msgstr "چېتىلغاندا سۈرەتلەرنى ئىمپورت قىلسۇن" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA" @@ -489,64 +473,60 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:458 msgid "Sync _Palm™ devices when connected" -msgstr "Palm™ デバイスが接続されたら同期をとる(_P)" +msgstr "ئەگەر Palm™ ئۈسكۈنىسى چېتىلسا قەدەمداشلىسۇن(_P)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:480 msgid "Pocket PCs" -msgstr "Pocket PC" +msgstr "يانچۇق كومپيۇتېرى(Pocket PC)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:497 msgid "Sync Pocket P_C devices when connected" -msgstr "Pocket PC デバイスが接続されたら同期をとる(_C)" +msgstr "ئەگەر يانچۇق كومپيۇتېرلىرى(Pocket PC) چېتىلسا قەدەمداشلىسۇن(_C)" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" -msgstr "پرىنتېر" +msgstr "پرىنتېرلار" #: ../thunar-volman-settings/tvm-preferences-dialog.c:545 msgid "Automatically run a program when a _printer is connected" -msgstr "プリンタが接続されたら自動的にプログラムを実行する(_P)" +msgstr "پرىنتېر چېتىلغاندا بىر پروگراممىنى ئىجرا قىلسۇن(_P)" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" -msgstr "كىرگۈزۈش ئۈسكۈنىسى" +msgstr "كىرگۈزۈش ئۈسكۈنىلىرى" #: ../thunar-volman-settings/tvm-preferences-dialog.c:576 msgid "Keyboards" -msgstr "キーボード" +msgstr "ھەرپتاختىلار" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "USBキーボードが接続されたら自動的にプログラムを実行する(_K)" +msgstr "بىر USB ھەرپتاختىسى چېتىلغاندا بىر پروگراممىنى ئىجرا قىلسۇن(_K)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" -msgstr "Mice" +msgstr "چاشقىنەك" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" -msgstr "USBマウスが接続されたら自動的にプログラムを実行する(_M)" +msgstr "بىر USB چاشقىنىكى چېتىلغاندا بىر پروگراممىنى ئىجرا قىلسۇن(_M)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" -msgstr "タブレット" +msgstr "سەزگۈر تاختا" #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "タブレットが接続されたら自動的にプログラムを実行する(_T)" +msgstr "ئەگەر سەزگۈر تاختا(Tablet) چېتىلسا بىر پروگراممىنى ئىجرا قىلسۇن(_T)" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" -msgstr "コマンド(_M):" +msgstr "بۇيرۇق(_M):" #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" diff -Nru thunar-volman-0.6.1/po/uk.po thunar-volman-0.8.1/po/uk.po --- thunar-volman-0.6.1/po/uk.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/uk.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,29 +1,30 @@ -# Ukrainian translation of thunar-volman -# Copyright (C) 2007 Dmitry Nikitin -# This file is distributed under the same license as the thunar-volman package. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # -# Dmitry Nikitin , 2007. +# Translators: +# Dmitry Nikitin , 2007 +# Yarema aka Knedlyk , 2013 msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-23 17:36+0000\n" -"PO-Revision-Date: 2007-11-10 20:23+0200\n" -"Last-Translator: Dmitry Nikitin \n" -"Language-Team: Ukrainian \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-09-28 21:11+0000\n" +"Last-Translator: Yarema aka Knedlyk \n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfce/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: KBabel 1.11.4\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "Шлях sysfs до щойно доданого пристрою" +msgid "The sysfs path of the newly added device" +msgstr "Шлях sysfs для новододаних пристроїв" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "Налаштувати керування змінними дисками і пристроями" @@ -35,23 +36,23 @@ #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Thunar Керівник Томів" +msgstr "Менеджер Розділів для Thunar" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "Всі права застережено." -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "Будь-ласка, звітуйте про помилки для <%s>." -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "Немає пристрою з шляхом sysfs \"%s\"" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "Ви повинні вказати шлях sysfs для нових пристроїв з --device-added" @@ -162,17 +163,17 @@ #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "Том змонтований" +msgstr "Розділ змонтований" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "Том \"%s\" автоматично змонтований" +msgstr "Розділ \"%s\" автоматично змонтований" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "Вставлений том був автоматично змонтований" +msgstr "Вставлений пристрій був автоматично змонтований" #: ../thunar-volman/tvm-block-device.c:694 #, c-format @@ -211,13 +212,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "Невідомий тип блок-пристрою" +msgid "Unknown block device type \"%s\"" +msgstr "Невідомий тип \"%s\" блок-пристрою" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "Тип пристрою не підтримується" +msgid "Device type \"%s\" not supported" +msgstr "Тип пристрою \"%s\" не підтримується" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -247,8 +248,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "Невідомий тип пристрою вводу" +msgid "Unsupported input device type \"%s\"" +msgstr "Невідомий тип \"%s\" пристрою вводу" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -315,15 +316,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "Тип пристрою USB не підтримується" +msgid "Unsupported USB device type \"%s\"" +msgstr "Тип пристрою USB \"%s\" не підтримується " #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Thunar Менеджер Пристроїв" +msgstr "Налаштування Менеджера Розділів для Thunar" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "Переносні Пристрої і Медіа" @@ -522,7 +523,7 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:671 msgid "Automatically run a program when a _tablet is connected" -msgstr "Автоматично запускати програму коли _tablet під'єднано" +msgstr "Автоматично запускати програму, коли _таблет під’єднано" #: ../thunar-volman-settings/tvm-preferences-dialog.c:679 msgid "Com_mand:" @@ -531,67 +532,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "невдача при відкритті переглядача документації" - -#~ msgid "input-keyboard" -#~ msgstr "клавіатура" - -#~ msgid "input-tablet" -#~ msgstr "таблет" - -#~ msgid "input-mouse" -#~ msgstr "мишка" - -#~ msgid "Failed to open display" -#~ msgstr "Невдача при спробі відкити дисплей" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Команда розробників Thunar. Всі права захищено." - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Написано Benedikt Meurer ." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "Визначений UDI \"%s\" не є достовірним UDI для пристрою HAL" - -#~ msgid "Encrypted volume" -#~ msgstr "Зашифрований том" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "Монтування зашифрованого тому..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "Налаштувати криптографічний шар..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "Ви не уповноважені налаштовувати криптографічний шар" - -#~ msgid "Wrong password" -#~ msgstr "Невірний пароль" - -#~ msgid "Wrong password." -#~ msgstr "Невірний пароль." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "Цей том зашифрований." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "Будь ласка введіть Ваш пароль для розшифровки і монтування тому." - -#~ msgid "_Mount" -#~ msgstr "_Монтувати" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "Не вдалось налаштувати зашифроватий том" - -#~ msgid "Choose Disc Type" -#~ msgstr "Вибрати Тип Диску" - -#~ msgid "Make _DVD" -#~ msgstr "Створити _DVD" - -#~ msgid "Removable Media" -#~ msgstr "Переносні пристрої" diff -Nru thunar-volman-0.6.1/po/ur_PK.po thunar-volman-0.8.1/po/ur_PK.po --- thunar-volman-0.6.1/po/ur_PK.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ur_PK.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,32 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# +# +# Translators: msgid "" msgstr "" -"Project-Id-Version: thunar-volman.pot\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2009-05-14 02:39+0500\n" -"Last-Translator: Muhammad Ali Makki \n" -"Language-Team: Urdu \n" -"Language: ur\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/xfce/language/ur_PK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Urdu\n" -"X-Poedit-Country: PAKISTAN\n" -"X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: ur_PK\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -#, fuzzy -msgid "The syfs path of the newly added device" -msgstr "نئی شامل کردہ ڈیوائس کا HAL ڈیوائس UDI" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "قابلِ فصل ڈرائیوز اور میڈیا کی ادارت وضع کریں" @@ -40,24 +36,24 @@ msgid "Thunar Volume Manager" msgstr "تھنر والیم منیجر" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "" -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "بگ <%s> رپورٹ کریں" -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "" -#: ../thunar-volman/main.c:186 -#, fuzzy, c-format +#: ../thunar-volman/main.c:188 +#, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "--device-added سے نئی HAL ڈیوائس UDI کا تعین لازمی ہے" +msgstr "" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -65,9 +61,8 @@ msgstr "فوٹو اور موسیقی" #: ../thunar-volman/tvm-block-device.c:205 -#, fuzzy msgid "Photos were found on your portable music player" -msgstr "آپ کے پورٹبل موسیقی پلیئر میں فوٹو پائے گئے ہیں." +msgstr "" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -98,16 +93,14 @@ msgstr "تصاویر درآمد کریں" #: ../thunar-volman/tvm-block-device.c:274 -#, fuzzy msgid "A photo card has been detected" -msgstr "فوٹو کارڈ دریافت ہوا ہے." +msgstr "" #: ../thunar-volman/tvm-block-device.c:275 msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"کارڈ میں تصاویر ہیں. کیا آپ ان تصاویر کو اپنے ایلبم میں شامل کرنا چاہتے ہیں؟" +msgstr "کارڈ میں تصاویر ہیں. کیا آپ ان تصاویر کو اپنے ایلبم میں شامل کرنا چاہتے ہیں؟" #. prompt the user to execute the file #. prompt the user to execute this file @@ -196,14 +189,12 @@ msgstr "" #: ../thunar-volman/tvm-block-device.c:824 -#, fuzzy msgid "Audio/Data CD" -msgstr "صوتی / ڈیٹا سی ڈی" +msgstr "" #: ../thunar-volman/tvm-block-device.c:825 -#, fuzzy msgid "The CD in the drive contains both music and files" -msgstr "ڈرائیو میں موجود سی ڈی میں موسیقی اور فائلیں دونوں ہیں." +msgstr "" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" @@ -219,49 +210,32 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" +msgid "Unknown block device type \"%s\"" msgstr "" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" +msgid "Device type \"%s\" not supported" msgstr "" -#: ../thunar-volman/tvm-input-device.c:74 -#, fuzzy -msgid "input-keyboard" -msgstr "کیبورڈ" - #: ../thunar-volman/tvm-input-device.c:75 -#, fuzzy msgid "Keyboard detected" -msgstr "کیبورڈ" +msgstr "" #: ../thunar-volman/tvm-input-device.c:76 -#, fuzzy msgid "A keyboard was detected" -msgstr "فوٹو کارڈ دریافت ہوا ہے." - -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" msgstr "" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 -#, fuzzy msgid "Tablet detected" -msgstr "آٹو رن موافقت دریافت ہوئی ہے" +msgstr "" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" msgstr "" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "" @@ -272,7 +246,7 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" +msgid "Unsupported input device type \"%s\"" msgstr "" #: ../thunar-volman/tvm-run.c:171 @@ -285,9 +259,8 @@ msgstr "" #: ../thunar-volman/tvm-run.c:190 -#, fuzzy msgid "You have inserted a blank DVD." -msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے." +msgstr "" #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -298,24 +271,20 @@ msgstr "" #: ../thunar-volman/tvm-run.c:200 -#, fuzzy msgid "Blank CD inserted" -msgstr "خالی سیڈیاں اور ڈی وی ڈی" +msgstr "" #: ../thunar-volman/tvm-run.c:201 -#, fuzzy msgid "You have inserted a blank CD." -msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے." +msgstr "" #: ../thunar-volman/tvm-run.c:204 -#, fuzzy msgid "Burn _Data CD" -msgstr "_ڈیٹا سی ڈی بنائیں" +msgstr "" #: ../thunar-volman/tvm-run.c:205 -#, fuzzy msgid "Burn _Audio CD" -msgstr "_صوتی سی ڈی بنائیں" +msgstr "" #: ../thunar-volman/tvm-run.c:229 #, c-format @@ -332,9 +301,8 @@ msgstr "" #: ../thunar-volman/tvm-usb-device.c:63 -#, fuzzy msgid "A photo camera was detected" -msgstr "فوٹو کارڈ دریافت ہوا ہے." +msgstr "" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" @@ -346,16 +314,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" +msgid "Unsupported USB device type \"%s\"" msgstr "" #. setup application name #: ../thunar-volman-settings/main.c:52 -#, fuzzy msgid "Thunar Volume Manager Settings" -msgstr "تھنر والیم منیجر" +msgstr "" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "قابلِ فصل ڈرئیوز اور میڈیا" @@ -388,9 +355,8 @@ msgid "Shell Scripts" msgstr "شیل سکرپٹ" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "سٹوریج" @@ -435,9 +401,8 @@ msgid "Command for A_udio CDs:" msgstr "_صوتی سیڈیوں کے لیے کمانڈ:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "ملٹی میڈیا" @@ -481,9 +446,8 @@ msgid "Play _music files when connected" msgstr "متصل ہونے پر مو_سیقی فائلیں چلائیں" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "کیمرے" @@ -496,9 +460,8 @@ msgid "Import digital photographs when connected" msgstr "متصل ہونے پر رقمی فوٹوگراف درآمد کریں" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -519,9 +482,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "متصل ہونے پر پاکٹ پی سی ڈیوائسز کو ہم آہنگ کریں" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -531,9 +493,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "_پرنٹر کے متصل ہونے پر خودکار طور پر پروگرام چلائیں" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "ماداخل ڈیوائسس" @@ -543,18 +504,16 @@ msgstr "کیبورڈ" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "یو ایس بی کیبورڈ متصل ہونے پر پروگرام خودکار طور پر چلائیں" +msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "مائیس" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" -msgstr "یو ایس بی ماؤس متصل ہونے پر خودکار طور پر پروگرام چلائیں" +msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -571,59 +530,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "دستاویزات براؤزر کھولنے میں ناکامی" - -#~ msgid "Failed to open display" -#~ msgstr "ڈسپلے کھولنے میں ناکامی" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "تھنر ترقیاتی ٹیم. تمام حقوق محفوظ ہیں. اردو ترجمہ از محمد علی مکی" - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Benedikt Meurer نے لکھا." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "معین کردہ UDI \"%s\" غیر موزوں HAL ڈیوائس UDI ہے" - -#~ msgid "Encrypted volume" -#~ msgstr "رمز شدہ (انکرپٹڈ) والیم" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "رمز شدہ (انکرپٹڈ) والیم ماؤنٹ کیا " -#~ "جارہا ہے..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "کرپٹو تہہ مرتب کی جارہی ہے..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "آپ کو کرپٹو تہہ مرتب کرنے کی اجازت نہیں ہے" - -#~ msgid "Wrong password" -#~ msgstr "غلط پاس ورڈ" - -#~ msgid "Wrong password." -#~ msgstr "غلط پاس ورڈ." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "والیم رمز (انکرپٹڈ) ہے." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "والیم کو غیر رمز شدہ اور ماؤنٹ کرنے کے لیے اپنا پاس ورڈ لکھیں." - -#~ msgid "_Mount" -#~ msgstr "-ماؤنٹ" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "رمز شدہ (انکرپٹڈ) والیم کو مرتب کرنے میں ناکامی" - -#~ msgid "Choose Disc Type" -#~ msgstr "ڈسک کی نوعیت منتخب کریں" - -#~ msgid "Make _DVD" -#~ msgstr "_ڈی وی ڈی بنائیں" - -#~ msgid "Removable Media" -#~ msgstr "قابلِ فصل میڈیا" diff -Nru thunar-volman-0.6.1/po/ur.po thunar-volman-0.8.1/po/ur.po --- thunar-volman-0.6.1/po/ur.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/ur.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,32 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# +# +# Translators: msgid "" msgstr "" -"Project-Id-Version: thunar-volman.pot\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:51+0100\n" -"PO-Revision-Date: 2009-05-14 02:39+0500\n" -"Last-Translator: Muhammad Ali Makki \n" -"Language-Team: Urdu \n" -"Language: ur\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-11-19 13:17+0000\n" +"Last-Translator: Xfce \n" +"Language-Team: Urdu (http://www.transifex.com/projects/p/xfce/language/ur/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Urdu\n" -"X-Poedit-Country: PAKISTAN\n" -"X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: ur\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar-volman/main.c:59 -#, fuzzy -msgid "The syfs path of the newly added device" -msgstr "نئی شامل کردہ ڈیوائس کا HAL ڈیوائس UDI" +msgid "The sysfs path of the newly added device" +msgstr "" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "قابلِ فصل ڈرائیوز اور میڈیا کی ادارت وضع کریں" @@ -40,24 +36,24 @@ msgid "Thunar Volume Manager" msgstr "تھنر والیم منیجر" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "" -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "بگ <%s> رپورٹ کریں" -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "" -#: ../thunar-volman/main.c:186 -#, fuzzy, c-format +#: ../thunar-volman/main.c:188 +#, c-format msgid "Must specify the sysfs path of new devices with --device-added" -msgstr "--device-added سے نئی HAL ڈیوائس UDI کا تعین لازمی ہے" +msgstr "" #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -65,9 +61,8 @@ msgstr "فوٹو اور موسیقی" #: ../thunar-volman/tvm-block-device.c:205 -#, fuzzy msgid "Photos were found on your portable music player" -msgstr "آپ کے پورٹبل موسیقی پلیئر میں فوٹو پائے گئے ہیں." +msgstr "" #: ../thunar-volman/tvm-block-device.c:206 msgid "Would you like to import the photos or manage the music?" @@ -98,16 +93,14 @@ msgstr "تصاویر درآمد کریں" #: ../thunar-volman/tvm-block-device.c:274 -#, fuzzy msgid "A photo card has been detected" -msgstr "فوٹو کارڈ دریافت ہوا ہے." +msgstr "" #: ../thunar-volman/tvm-block-device.c:275 msgid "" "There are photos on the card. Would you like to add these photos to your " "album?" -msgstr "" -"کارڈ میں تصاویر ہیں. کیا آپ ان تصاویر کو اپنے ایلبم میں شامل کرنا چاہتے ہیں؟" +msgstr "کارڈ میں تصاویر ہیں. کیا آپ ان تصاویر کو اپنے ایلبم میں شامل کرنا چاہتے ہیں؟" #. prompt the user to execute the file #. prompt the user to execute this file @@ -196,14 +189,12 @@ msgstr "" #: ../thunar-volman/tvm-block-device.c:824 -#, fuzzy msgid "Audio/Data CD" -msgstr "صوتی / ڈیٹا سی ڈی" +msgstr "" #: ../thunar-volman/tvm-block-device.c:825 -#, fuzzy msgid "The CD in the drive contains both music and files" -msgstr "ڈرائیو میں موجود سی ڈی میں موسیقی اور فائلیں دونوں ہیں." +msgstr "" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" @@ -219,49 +210,32 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" +msgid "Unknown block device type \"%s\"" msgstr "" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" +msgid "Device type \"%s\" not supported" msgstr "" -#: ../thunar-volman/tvm-input-device.c:74 -#, fuzzy -msgid "input-keyboard" -msgstr "کیبورڈ" - #: ../thunar-volman/tvm-input-device.c:75 -#, fuzzy msgid "Keyboard detected" -msgstr "کیبورڈ" +msgstr "" #: ../thunar-volman/tvm-input-device.c:76 -#, fuzzy msgid "A keyboard was detected" -msgstr "فوٹو کارڈ دریافت ہوا ہے." - -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid "input-tablet" msgstr "" #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 -#, fuzzy msgid "Tablet detected" -msgstr "آٹو رن موافقت دریافت ہوئی ہے" +msgstr "" #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid "A graphics tablet was detected" msgstr "" -#: ../thunar-volman/tvm-input-device.c:110 -msgid "input-mouse" -msgstr "" - #: ../thunar-volman/tvm-input-device.c:111 msgid "Mouse detected" msgstr "" @@ -272,7 +246,7 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" +msgid "Unsupported input device type \"%s\"" msgstr "" #: ../thunar-volman/tvm-run.c:171 @@ -285,9 +259,8 @@ msgstr "" #: ../thunar-volman/tvm-run.c:190 -#, fuzzy msgid "You have inserted a blank DVD." -msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے." +msgstr "" #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" @@ -298,24 +271,20 @@ msgstr "" #: ../thunar-volman/tvm-run.c:200 -#, fuzzy msgid "Blank CD inserted" -msgstr "خالی سیڈیاں اور ڈی وی ڈی" +msgstr "" #: ../thunar-volman/tvm-run.c:201 -#, fuzzy msgid "You have inserted a blank CD." -msgstr "آپ نے ایک خالی سی ڈی داخل کی ہے." +msgstr "" #: ../thunar-volman/tvm-run.c:204 -#, fuzzy msgid "Burn _Data CD" -msgstr "_ڈیٹا سی ڈی بنائیں" +msgstr "" #: ../thunar-volman/tvm-run.c:205 -#, fuzzy msgid "Burn _Audio CD" -msgstr "_صوتی سی ڈی بنائیں" +msgstr "" #: ../thunar-volman/tvm-run.c:229 #, c-format @@ -332,9 +301,8 @@ msgstr "" #: ../thunar-volman/tvm-usb-device.c:63 -#, fuzzy msgid "A photo camera was detected" -msgstr "فوٹو کارڈ دریافت ہوا ہے." +msgstr "" #: ../thunar-volman/tvm-usb-device.c:71 msgid "Printer detected" @@ -346,16 +314,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" +msgid "Unsupported USB device type \"%s\"" msgstr "" #. setup application name #: ../thunar-volman-settings/main.c:52 -#, fuzzy msgid "Thunar Volume Manager Settings" -msgstr "تھنر والیم منیجر" +msgstr "" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "قابلِ فصل ڈرئیوز اور میڈیا" @@ -388,9 +355,8 @@ msgid "Shell Scripts" msgstr "شیل سکرپٹ" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "سٹوریج" @@ -435,9 +401,8 @@ msgid "Command for A_udio CDs:" msgstr "_صوتی سیڈیوں کے لیے کمانڈ:" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "ملٹی میڈیا" @@ -481,9 +446,8 @@ msgid "Play _music files when connected" msgstr "متصل ہونے پر مو_سیقی فائلیں چلائیں" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "کیمرے" @@ -496,9 +460,8 @@ msgid "Import digital photographs when connected" msgstr "متصل ہونے پر رقمی فوٹوگراف درآمد کریں" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDAs" @@ -519,9 +482,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "متصل ہونے پر پاکٹ پی سی ڈیوائسز کو ہم آہنگ کریں" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -531,9 +493,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "_پرنٹر کے متصل ہونے پر خودکار طور پر پروگرام چلائیں" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "ماداخل ڈیوائسس" @@ -543,18 +504,16 @@ msgstr "کیبورڈ" #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -#, fuzzy msgid "Automatically run a program when a USB _keyboard is connected" -msgstr "یو ایس بی کیبورڈ متصل ہونے پر پروگرام خودکار طور پر چلائیں" +msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid "Mice" msgstr "مائیس" #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -#, fuzzy msgid "Automatically run a program when a USB _mouse is connected" -msgstr "یو ایس بی ماؤس متصل ہونے پر خودکار طور پر پروگرام چلائیں" +msgstr "" #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid "Tablet" @@ -571,59 +530,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "دستاویزات براؤزر کھولنے میں ناکامی" - -#~ msgid "Failed to open display" -#~ msgstr "ڈسپلے کھولنے میں ناکامی" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "تھنر ترقیاتی ٹیم. تمام حقوق محفوظ ہیں. اردو ترجمہ از محمد علی مکی" - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "Benedikt Meurer نے لکھا." - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "معین کردہ UDI \"%s\" غیر موزوں HAL ڈیوائس UDI ہے" - -#~ msgid "Encrypted volume" -#~ msgstr "رمز شدہ (انکرپٹڈ) والیم" - -#~ msgid "" -#~ "Mounting encrypted volume..." -#~ msgstr "" -#~ "رمز شدہ (انکرپٹڈ) والیم ماؤنٹ کیا " -#~ "جارہا ہے..." - -#~ msgid "Setting up the crypto layer..." -#~ msgstr "کرپٹو تہہ مرتب کی جارہی ہے..." - -#~ msgid "You are not privileged to setup the crypto layer" -#~ msgstr "آپ کو کرپٹو تہہ مرتب کرنے کی اجازت نہیں ہے" - -#~ msgid "Wrong password" -#~ msgstr "غلط پاس ورڈ" - -#~ msgid "Wrong password." -#~ msgstr "غلط پاس ورڈ." - -#~ msgid "" -#~ "This volume is encrypted." -#~ msgstr "" -#~ "والیم رمز (انکرپٹڈ) ہے." - -#~ msgid "Please enter your password to decrypt and mount the volume." -#~ msgstr "والیم کو غیر رمز شدہ اور ماؤنٹ کرنے کے لیے اپنا پاس ورڈ لکھیں." - -#~ msgid "_Mount" -#~ msgstr "-ماؤنٹ" - -#~ msgid "Failed to setup the encrypted volume" -#~ msgstr "رمز شدہ (انکرپٹڈ) والیم کو مرتب کرنے میں ناکامی" - -#~ msgid "Choose Disc Type" -#~ msgstr "ڈسک کی نوعیت منتخب کریں" - -#~ msgid "Make _DVD" -#~ msgstr "_ڈی وی ڈی بنائیں" - -#~ msgid "Removable Media" -#~ msgstr "قابلِ فصل میڈیا" diff -Nru thunar-volman-0.6.1/po/vi.po thunar-volman-0.8.1/po/vi.po --- thunar-volman-0.6.1/po/vi.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/vi.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,527 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# truongap , 2014 +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2014-03-07 01:45+0000\n" +"Last-Translator: truongap \n" +"Language-Team: Vietnamese (http://www.transifex.com/projects/p/xfce/language/vi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: vi\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "In thông tin phiên bản và thoát" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "Trình quản lý ổ đĩa của Thunar" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "Mọi quyền đã được bảo lưu" + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Vui lòng báo lỗi tới <%s>." + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "Ảnh và nhạc" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "Ảnh được tìm thấy trên thiết bị nghe nhạc di động của bạn" + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "Bạn có muốn nhập thêm ảnh hay quản lý nhạc?" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "Nhập thêm ảnh" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "Thẻ nhớ ảnh đã được tìm thấy" + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "Có ảnh trên thẻ nhớ. Bạn có muốn thêm những bức ảnh này vào album của bạn?" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "Bạn có muốn cho phép \"%s\" được chạy?" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "Xác nhận tự động chạy" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "" + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "Bạn có muốn mở \"%s\"?" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "Xác nhận tự động mở" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "" + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "CD đã được gắn" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "DVD đã được gắn" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "CD đã được tự động gắn kết" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "DVD đã được tự động gắn kết" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "Ổ đĩa đã được gắn" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "Ổ \"%s\" đã được tự động gắn kết" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "Ổ đĩa vừa được thêm vào đã được tự động gắn kết" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "Không thể xác định điểm gắn kết" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "Không thể gắn kết thiết bị" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "CD Nhạc/Dữ liệu" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "CD trong ổ đĩa bao gồm cả nhạc và tệp tin" + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "Bạn muốn nghe nhạc hay duyệt tệp tin?" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "Không rõ khối thiết bị loại \"%s\"" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "Loại thiết bị \"%s\" không được hỗ trợ" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "Tìm thấy bàn phím" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "Bàn phím đã được tìm thấy" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "Tìm thấy máy tính bảng" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "Một máy tính tính bảng đã được tìm thấy" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "Tìm thấy con chuột" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "Con chuột đã được tìm thấy" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "Loại thiết bị nhập \"%s\" không được hỗ trợ" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "Tự động ghi đĩa CD và DVD trống bị vô hiệu hóa" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "DVD trống đã được thêm" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "Bạn vừa thêm một DVD trống" + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "Bạn muốn làm điều gì?" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "CD trống đã được thêm" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "Bạn vừa thêm một CD trống" + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "Tìm thấy máy ảnh" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "Một máy ảnh vừa được tìm thấy" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "Tìm thấy máy in" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "Một máy in USB vừa được tìm thấy" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "Loại thiết bị USB \"%s\" không được hỗ trợ" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "Cài đặt trình quản lý ổ đĩa của Thunar" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "Lựa chọn một ứng dụng" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "Tất cả tệp tin" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "Các tệp tin có thể thực thi" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "Kịch bản Perl" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "Kịch bản Python" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "Kịch bản Ruby" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "Kịch bản shell" + +#. Storage +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "Ổ lưu trữ" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "Ổ lưu trữ có thể gỡ bỏ" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "Gắn kết ổ đĩa _rời khi được cắm nóng" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "CD và DVD trống" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "_Ghi đĩa CD hay DVD khi một đĩa trống được chèn vào" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "Lệnh cho CD _dữ liệu:" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "Lệnh cho CD âm _thanh:" + +#. Multimedia +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "Đa phương tiện" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "CD âm thanh" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "CD/DVD ảnh động" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "" + +#. Cameras +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "Máy ảnh" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "Máy ảnh kỹ thuật số" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "Nhập các bức ảnh kỹ thuật số khi được kết nối" + +#. PDAs +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "PDA" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "Pocket PCs" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "" + +#. Printers +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "Máy in" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "" + +#. Input Devices +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "Thiết bị nhập" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "Bàn phím" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "Chuột" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "Máy tính bảng" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "Mở trình duyệt tài liệu, thất bại" diff -Nru thunar-volman-0.6.1/po/zh_CN.po thunar-volman-0.8.1/po/zh_CN.po --- thunar-volman-0.6.1/po/zh_CN.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/zh_CN.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,59 +1,59 @@ -# Simplified Chinese translations for -# the thunar-volman package. -# This file is distributed under the same license as -# the thunar-volman package. -# Jiahua Huang , 2009. -# Hunt Xu , 2009. -# Chipong Luo , 2011, 2012. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Chipong Luo , 2011-2012 +# Hunt Xu , 2009 +# Jiahua Huang , 2009 msgid "" msgstr "" -"Project-Id-Version: thunar-volman\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-11 00:15+0000\n" -"PO-Revision-Date: 2011-03-13 14:50+0800\n" -"Last-Translator: Chipong Luo \n" -"Language-Team: Chinese (Simplified) \n" -"Language: zh_CN\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-10-17 12:28+0000\n" +"Last-Translator: Chipong \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "新添加设备的 sysf 路径" +msgid "The sysfs path of the newly added device" +msgstr "新接入设备的 sysfs 路径" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "可移动驱动器和介质的配置管理" #: ../thunar-volman/main.c:61 msgid "Print version information and exit" -msgstr "列印版本信息并退出" +msgstr "列印版本信息后退出" #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" msgstr "Thunar 卷管理器" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "保留所有权利。" -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "请向 <%s> 报告缺陷。" -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "没有 sysfs 路径 “%s” 的设备" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "必须用 --device-added 指定新增设备的 sysfs 路径" @@ -111,7 +111,7 @@ #: ../thunar-volman/tvm-block-device.c:420 #, c-format msgid "Would you like to allow \"%s\" to run?" -msgstr "您想要允许 “%s” 运行吗？" +msgstr "您想要让 “%s” 运行吗？" #: ../thunar-volman/tvm-block-device.c:376 #: ../thunar-volman/tvm-block-device.c:423 @@ -121,7 +121,7 @@ #: ../thunar-volman/tvm-block-device.c:377 #: ../thunar-volman/tvm-block-device.c:424 msgid "Auto-Run capability detected" -msgstr "检测到自动运行能力" +msgstr "检测到自动运行功能" #: ../thunar-volman/tvm-block-device.c:379 #: ../thunar-volman/tvm-block-device.c:426 @@ -140,7 +140,7 @@ #: ../thunar-volman/tvm-block-device.c:506 msgid "Auto-Open capability detected" -msgstr "检测到自动打开能力" +msgstr "检测到自动打开功能" #: ../thunar-volman/tvm-block-device.c:508 msgid "_Open" @@ -189,7 +189,7 @@ #: ../thunar-volman/tvm-block-device.c:749 #, c-format msgid "Could not detect the volume corresponding to the device" -msgstr "未能检测此卷的相应设备" +msgstr "未能检测此卷的对应设备" #: ../thunar-volman/tvm-block-device.c:824 msgid "Audio/Data CD" @@ -197,11 +197,11 @@ #: ../thunar-volman/tvm-block-device.c:825 msgid "The CD in the drive contains both music and files" -msgstr "驱动器中的 CD 既有音乐又有文件。" +msgstr "驱动器的 CD 中既有音乐又有文件。" #: ../thunar-volman/tvm-block-device.c:827 msgid "Would you like to listen to music or browse the files?" -msgstr "您想要播放音乐或浏览文件吗？" +msgstr "您想要播放音乐还是浏览文件？" #: ../thunar-volman/tvm-block-device.c:830 msgid "_Browse Files" @@ -213,13 +213,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "未知块设备类型" +msgid "Unknown block device type \"%s\"" +msgstr "未知块设备类型 “%s”" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "设备类型不支持" +msgid "Device type \"%s\" not supported" +msgstr "设备类型 “%s” 不支持" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -249,8 +249,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "不支持的输入设备类型" +msgid "Unsupported input device type \"%s\"" +msgstr "不支持的输入设备类型 “%s”" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -317,15 +317,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "不支持的 USB 设备类型" +msgid "Unsupported USB device type \"%s\"" +msgstr "不支持的 USB 设备类型 “%s”" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunar 卷管理器设置" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "可移动驱动器和介质" @@ -358,9 +358,8 @@ msgid "Shell Scripts" msgstr "Shell 脚本" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "存储器" @@ -403,11 +402,10 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:239 msgid "Command for A_udio CDs:" -msgstr "音频 CD 命令(_U)：" +msgstr "音频 CD 的命令(_U)：" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "多媒体" @@ -451,9 +449,8 @@ msgid "Play _music files when connected" msgstr "连接后播放音乐文件(_M)" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "相机" @@ -466,9 +463,8 @@ msgid "Import digital photographs when connected" msgstr "连接后导入数码照片" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA" @@ -489,9 +485,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "连接后同步掌上电脑设备(_C)" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -501,9 +496,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "打印机连接后自动运行程序(_P)" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "输入设备" diff -Nru thunar-volman-0.6.1/po/zh_HK.po thunar-volman-0.8.1/po/zh_HK.po --- thunar-volman-0.6.1/po/zh_HK.po 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/po/zh_HK.po 2015-02-26 13:26:46.000000000 +0000 @@ -0,0 +1,532 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Thunar-volman\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-10-12 11:13+0000\n" +"Last-Translator: Walter Cheuk \n" +"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/xfce/language/zh_HK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_HK\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../thunar-volman/main.c:59 +msgid "The sysfs path of the newly added device" +msgstr "新添加裝置的 sysfs 路徑" + +#: ../thunar-volman/main.c:60 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:104 +msgid "Configure management of removable drives and media" +msgstr "管理移除式裝置與媒體" + +#: ../thunar-volman/main.c:61 +msgid "Print version information and exit" +msgstr "列出版本資訊後結束" + +#. setup application name +#: ../thunar-volman/main.c:93 +msgid "Thunar Volume Manager" +msgstr "Thunar 儲存裝置管理員" + +#: ../thunar-volman/main.c:121 +msgid "All rights reserved." +msgstr "保留所有權利。" + +#: ../thunar-volman/main.c:122 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "請將錯誤報告 <%s>。" + +#: ../thunar-volman/main.c:176 +#, c-format +msgid "There is no device with the sysfs path \"%s\"" +msgstr "沒有 sysfs 路徑為「%s」的裝置" + +#: ../thunar-volman/main.c:188 +#, c-format +msgid "Must specify the sysfs path of new devices with --device-added" +msgstr "必須以 --device-added 來指定新裝置的 sysfs 路徑" + +#. ...so we need to prompt what to do +#: ../thunar-volman/tvm-block-device.c:204 +msgid "Photos and Music" +msgstr "相片和音樂" + +#: ../thunar-volman/tvm-block-device.c:205 +msgid "Photos were found on your portable music player" +msgstr "在您的可攜式音樂播放器找到相片" + +#: ../thunar-volman/tvm-block-device.c:206 +msgid "Would you like to import the photos or manage the music?" +msgstr "要匯入相片或管理音樂嗎？" + +#: ../thunar-volman/tvm-block-device.c:208 +#: ../thunar-volman/tvm-block-device.c:277 +#: ../thunar-volman/tvm-block-device.c:378 +#: ../thunar-volman/tvm-block-device.c:425 +#: ../thunar-volman/tvm-block-device.c:507 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-run.c:203 +msgid "Ig_nore" +msgstr "忽略(_N)" + +#: ../thunar-volman/tvm-block-device.c:209 +#: ../thunar-volman/tvm-block-device.c:278 +msgid "Import _Photos" +msgstr "匯入相片(_P)" + +#: ../thunar-volman/tvm-block-device.c:210 +msgid "Manage _Music" +msgstr "管理音樂(_M)" + +#. ask the user to import photos +#: ../thunar-volman/tvm-block-device.c:273 +msgid "Photo Import" +msgstr "相片匯入" + +#: ../thunar-volman/tvm-block-device.c:274 +msgid "A photo card has been detected" +msgstr "偵測到有相片記憶卡" + +#: ../thunar-volman/tvm-block-device.c:275 +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" +msgstr "在記憶卡找到相片。要將這些相片加入您的相簿嗎？" + +#. prompt the user to execute the file +#. prompt the user to execute this file +#: ../thunar-volman/tvm-block-device.c:373 +#: ../thunar-volman/tvm-block-device.c:420 +#, c-format +msgid "Would you like to allow \"%s\" to run?" +msgstr "允許執行「%s」嗎？" + +#: ../thunar-volman/tvm-block-device.c:376 +#: ../thunar-volman/tvm-block-device.c:423 +msgid "Auto-Run Confirmation" +msgstr "自動執行確認" + +#: ../thunar-volman/tvm-block-device.c:377 +#: ../thunar-volman/tvm-block-device.c:424 +msgid "Auto-Run capability detected" +msgstr "偵測到有自動執行功能" + +#: ../thunar-volman/tvm-block-device.c:379 +#: ../thunar-volman/tvm-block-device.c:426 +msgid "_Allow Auto-Run" +msgstr "允許自動執行(_A)" + +#. prompt the user whether to autoopen this file +#: ../thunar-volman/tvm-block-device.c:502 +#, c-format +msgid "Would you like to open \"%s\"?" +msgstr "要開啟「%s」嗎？" + +#: ../thunar-volman/tvm-block-device.c:505 +msgid "Auto-Open Confirmation" +msgstr "自動開啟確認" + +#: ../thunar-volman/tvm-block-device.c:506 +msgid "Auto-Open capability detected" +msgstr "偵測到有自動開啟功能" + +#: ../thunar-volman/tvm-block-device.c:508 +msgid "_Open" +msgstr "開啟(_O)" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "CD mounted" +msgstr "已掛載 CD" + +#: ../thunar-volman/tvm-block-device.c:619 +msgid "DVD mounted" +msgstr "已掛載 DVD" + +#: ../thunar-volman/tvm-block-device.c:621 +msgid "The CD was mounted automatically" +msgstr "已自動掛載 CD" + +#: ../thunar-volman/tvm-block-device.c:622 +msgid "The DVD was mounted automatically" +msgstr "已自動掛載 DVD" + +#: ../thunar-volman/tvm-block-device.c:632 +msgid "Volume mounted" +msgstr "已掛載儲存裝置" + +#: ../thunar-volman/tvm-block-device.c:635 +#, c-format +msgid "The volume \"%s\" was mounted automatically" +msgstr "已自動掛載「%s」儲存裝置" + +#: ../thunar-volman/tvm-block-device.c:640 +#, c-format +msgid "The inserted volume was mounted automatically" +msgstr "已自動掛載插入的儲存裝置" + +#: ../thunar-volman/tvm-block-device.c:694 +#, c-format +msgid "Unable to locate mount point" +msgstr "找不到掛載點" + +#: ../thunar-volman/tvm-block-device.c:740 +#, c-format +msgid "Unable to mount the device" +msgstr "無法掛載裝置" + +#: ../thunar-volman/tvm-block-device.c:749 +#, c-format +msgid "Could not detect the volume corresponding to the device" +msgstr "無法偵測到儲存裝置所對應的位置" + +#: ../thunar-volman/tvm-block-device.c:824 +msgid "Audio/Data CD" +msgstr "音訊/資料 CD" + +#: ../thunar-volman/tvm-block-device.c:825 +msgid "The CD in the drive contains both music and files" +msgstr "裝置裏的 CD 有音樂與資料檔案" + +#: ../thunar-volman/tvm-block-device.c:827 +msgid "Would you like to listen to music or browse the files?" +msgstr "要聽音樂還是瀏覽檔案？" + +#: ../thunar-volman/tvm-block-device.c:830 +msgid "_Browse Files" +msgstr "瀏覽檔案(_B)" + +#: ../thunar-volman/tvm-block-device.c:831 +msgid "_Play CD" +msgstr "播放 CD(_P)" + +#: ../thunar-volman/tvm-block-device.c:919 +#, c-format +msgid "Unknown block device type \"%s\"" +msgstr "未知的區塊裝置類型「%s」" + +#: ../thunar-volman/tvm-device.c:139 +#, c-format +msgid "Device type \"%s\" not supported" +msgstr "不支援的裝置類型「%s」" + +#: ../thunar-volman/tvm-input-device.c:75 +msgid "Keyboard detected" +msgstr "偵測到有鍵盤" + +#: ../thunar-volman/tvm-input-device.c:76 +msgid "A keyboard was detected" +msgstr "偵測到有一個鍵盤" + +#: ../thunar-volman/tvm-input-device.c:87 +#: ../thunar-volman/tvm-input-device.c:101 +msgid "Tablet detected" +msgstr "偵測到有繪圖板" + +#: ../thunar-volman/tvm-input-device.c:88 +#: ../thunar-volman/tvm-input-device.c:102 +msgid "A graphics tablet was detected" +msgstr "偵測到有一塊數碼繪圖板" + +#: ../thunar-volman/tvm-input-device.c:111 +msgid "Mouse detected" +msgstr "偵測到滑鼠" + +#: ../thunar-volman/tvm-input-device.c:112 +msgid "A mouse was detected" +msgstr "偵測到有一隻滑鼠" + +#: ../thunar-volman/tvm-input-device.c:141 +#, c-format +msgid "Unsupported input device type \"%s\"" +msgstr "未支援的輸入裝置類型「%s」" + +#: ../thunar-volman/tvm-run.c:171 +#, c-format +msgid "Autoburning of blank CDs and DVDs is disabled" +msgstr "已停用自動燒錄空白 CD 與 DVD 的功能" + +#: ../thunar-volman/tvm-run.c:189 +msgid "Blank DVD inserted" +msgstr "放入了空白的 DVD" + +#: ../thunar-volman/tvm-run.c:190 +msgid "You have inserted a blank DVD." +msgstr "放入了空白的 DVD。" + +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 +msgid "What would you like to do?" +msgstr "跟着要做什麼？" + +#: ../thunar-volman/tvm-run.c:193 +msgid "Burn _DVD" +msgstr "燒錄 DVD(_D)" + +#: ../thunar-volman/tvm-run.c:200 +msgid "Blank CD inserted" +msgstr "放入了空白的 CD" + +#: ../thunar-volman/tvm-run.c:201 +msgid "You have inserted a blank CD." +msgstr "放入了空白的 CD。" + +#: ../thunar-volman/tvm-run.c:204 +msgid "Burn _Data CD" +msgstr "燒錄資料 CD(_D)" + +#: ../thunar-volman/tvm-run.c:205 +msgid "Burn _Audio CD" +msgstr "燒錄音訊 CD(_A)" + +#: ../thunar-volman/tvm-run.c:229 +#, c-format +msgid "The burn command may not be empty" +msgstr "燒錄指令不可以留空" + +#: ../thunar-volman/tvm-run.c:268 +#, c-format +msgid "The CD player command is undefined" +msgstr "未定義 CD 播放程式指令" + +#: ../thunar-volman/tvm-usb-device.c:62 +msgid "Camera detected" +msgstr "偵測到相機" + +#: ../thunar-volman/tvm-usb-device.c:63 +msgid "A photo camera was detected" +msgstr "偵測到了一部相機" + +#: ../thunar-volman/tvm-usb-device.c:71 +msgid "Printer detected" +msgstr "偵測到打印機" + +#: ../thunar-volman/tvm-usb-device.c:72 +msgid "A USB printer was detected" +msgstr "偵測到了一部 USB 打印機" + +#: ../thunar-volman/tvm-usb-device.c:100 +#, c-format +msgid "Unsupported USB device type \"%s\"" +msgstr "未支援的 USB 裝置類型「%s」" + +#. setup application name +#: ../thunar-volman-settings/main.c:52 +msgid "Thunar Volume Manager Settings" +msgstr "Thunar 儲存裝置管理員設定" + +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:102 +msgid "Removable Drives and Media" +msgstr "移除式裝置與媒體" + +#: ../thunar-volman-settings/tvm-command-entry.c:240 +msgid "Select an Application" +msgstr "請選取應用程式" + +#: ../thunar-volman-settings/tvm-command-entry.c:250 +msgid "All Files" +msgstr "所有檔案" + +#: ../thunar-volman-settings/tvm-command-entry.c:255 +msgid "Executable Files" +msgstr "可執行檔" + +#: ../thunar-volman-settings/tvm-command-entry.c:270 +msgid "Perl Scripts" +msgstr "Perl 指令稿" + +#: ../thunar-volman-settings/tvm-command-entry.c:276 +msgid "Python Scripts" +msgstr "Python 指令稿" + +#: ../thunar-volman-settings/tvm-command-entry.c:282 +msgid "Ruby Scripts" +msgstr "Ruby 指令稿" + +#: ../thunar-volman-settings/tvm-command-entry.c:288 +msgid "Shell Scripts" +msgstr "Shell 指令稿" + +#. Storage +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:130 +msgid "Storage" +msgstr "儲存裝置" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:141 +msgid "Removable Storage" +msgstr "移除式儲存裝置" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:158 +msgid "_Mount removable drives when hot-plugged" +msgstr "熱插拔時掛載移除式裝置(_M)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:166 +msgid "Mount removable media when _inserted" +msgstr "插入移除式媒體時進行掛載(_I)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:174 +msgid "B_rowse removable media when inserted" +msgstr "插入可移除式媒體時進行瀏覽(_R)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:182 +msgid "_Auto-run programs on new drives and media" +msgstr "自動執行新裝置與媒體上的程式(_A)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:189 +msgid "Auto-open files on new drives and media" +msgstr "自動開啟新裝置與媒體上的檔案" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:201 +msgid "Blank CDs and DVDs" +msgstr "空白 CD 與 DVD" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:218 +msgid "_Burn a CD or DVD when a blank disc is inserted" +msgstr "置入空白光碟時燒錄 CD 或 DVD(_B)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:229 +msgid "Command for _Data CDs:" +msgstr "資料 CD 所用指令(_D)：" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:239 +msgid "Command for A_udio CDs:" +msgstr "音訊 CD 所用指令(_U)：" + +#. Multimedia +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:255 +msgid "Multimedia" +msgstr "多媒體" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:266 +msgid "Audio CDs" +msgstr "音訊 CD" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:283 +msgid "Play _audio CDs when inserted" +msgstr "置入音訊 CD 時播放(_A)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:290 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:415 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:466 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:553 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:601 +msgid "_Command:" +msgstr "指令(_C)：" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:304 +msgid "Video CDs/DVDs" +msgstr "VCD/DVD" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:321 +msgid "Play _video CDs and DVDs when inserted" +msgstr "放入 VCD 與 DVD 時播放(_V)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:329 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:367 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:505 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:640 +msgid "C_ommand:" +msgstr "指令(_O)：" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:343 +msgid "Portable Music Players" +msgstr "可攜式音樂播放器" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:360 +msgid "Play _music files when connected" +msgstr "連接時播放音樂檔(_M)" + +#. Cameras +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:379 +msgid "Cameras" +msgstr "相機" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:390 +msgid "Digital Cameras" +msgstr "數碼相機" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:407 +msgid "Import digital photographs when connected" +msgstr "連接時匯入數碼相片" + +#. PDAs +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:427 +msgid "PDAs" +msgstr "PDA" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:441 +msgid "Palm™" +msgstr "Palm™" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:458 +msgid "Sync _Palm™ devices when connected" +msgstr "連接時同步 Palm™ 裝置(_P)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:480 +msgid "Pocket PCs" +msgstr "Pocket PC" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:497 +msgid "Sync Pocket P_C devices when connected" +msgstr "連接時同步 Pocket PC 裝置(_C)" + +#. Printers +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:517 +#: ../thunar-volman-settings/tvm-preferences-dialog.c:528 +msgid "Printers" +msgstr "打印機" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:545 +msgid "Automatically run a program when a _printer is connected" +msgstr "連接打印機時自動執行程式(_P)" + +#. Input Devices +#. +#: ../thunar-volman-settings/tvm-preferences-dialog.c:565 +msgid "Input Devices" +msgstr "輸入裝置" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:576 +msgid "Keyboards" +msgstr "鍵盤" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:593 +msgid "Automatically run a program when a USB _keyboard is connected" +msgstr "連接 USB 鍵盤時自動執行程式(_K)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:615 +msgid "Mice" +msgstr "滑鼠" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:632 +msgid "Automatically run a program when a USB _mouse is connected" +msgstr "連接 USB 滑鼠時自動執行程式(_M)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:654 +msgid "Tablet" +msgstr "繪圖板" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:671 +msgid "Automatically run a program when a _tablet is connected" +msgstr "連接繪圖板時自動執行程式(_T)" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:679 +msgid "Com_mand:" +msgstr "指令(_M)：" + +#: ../thunar-volman-settings/tvm-preferences-dialog.c:755 +msgid "Failed to open the documentation browser" +msgstr "未能開啟說明文件瀏覽器" diff -Nru thunar-volman-0.6.1/po/zh_TW.po thunar-volman-0.8.1/po/zh_TW.po --- thunar-volman-0.6.1/po/zh_TW.po 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/po/zh_TW.po 2015-02-26 13:26:46.000000000 +0000 @@ -1,30 +1,28 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# +# +# Translators: msgid "" msgstr "" -"Project-Id-Version: thunar-volman 0.2.0\n" +"Project-Id-Version: Thunar-volman\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-19 04:03+0000\n" -"PO-Revision-Date: 2012-01-19 15:24+0800\n" +"POT-Creation-Date: 2013-09-21 00:30+0200\n" +"PO-Revision-Date: 2013-10-08 14:29+0000\n" "Last-Translator: Cheng-Chia Tseng \n" -"Language-Team: Cheng-Wei Chien \n" -"Language: \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/xfce/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Country: TAIWAN\n" -"X-Poedit-Language: Chinese\n" -"X-Poedit-SourceCharset: utf-8\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../thunar-volman/main.c:59 -msgid "The syfs path of the newly added device" -msgstr "新加入裝置的 sysfs 路徑" +msgid "The sysfs path of the newly added device" +msgstr "新添加的裝置其 sysfs 路徑" #: ../thunar-volman/main.c:60 -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104 msgid "Configure management of removable drives and media" msgstr "管理可移除裝置與媒體的設定值" @@ -38,21 +36,21 @@ msgid "Thunar Volume Manager" msgstr "Thunar 儲存裝置管理員" -#: ../thunar-volman/main.c:119 +#: ../thunar-volman/main.c:121 msgid "All rights reserved." msgstr "保留所有權利。" -#: ../thunar-volman/main.c:120 +#: ../thunar-volman/main.c:122 #, c-format msgid "Please report bugs to <%s>." msgstr "請回報錯誤至 <%s>。" -#: ../thunar-volman/main.c:174 +#: ../thunar-volman/main.c:176 #, c-format msgid "There is no device with the sysfs path \"%s\"" msgstr "沒有 sysfs 路徑為「%s」的裝置" -#: ../thunar-volman/main.c:186 +#: ../thunar-volman/main.c:188 #, c-format msgid "Must specify the sysfs path of new devices with --device-added" msgstr "必須以 --device-added 來指定新裝置的 sysfs 路徑" @@ -75,8 +73,7 @@ #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid "Ig_nore" msgstr "忽略(_N)" @@ -100,7 +97,9 @@ msgstr "已偵測到一張相片記憶卡" #: ../thunar-volman/tvm-block-device.c:275 -msgid "There are photos on the card. Would you like to add these photos to your album?" +msgid "" +"There are photos on the card. Would you like to add these photos to your " +"album?" msgstr "在記憶卡中找到相片。您要將這些相片加入您的相簿嗎？" #. prompt the user to execute the file @@ -211,13 +210,13 @@ #: ../thunar-volman/tvm-block-device.c:919 #, c-format -msgid "Unknown block device type" -msgstr "未知的區塊裝置類型" +msgid "Unknown block device type \"%s\"" +msgstr "未知的區塊裝置類型「%s」" #: ../thunar-volman/tvm-device.c:139 #, c-format -msgid "Device type not supported" -msgstr "未支援的裝置類型" +msgid "Device type \"%s\" not supported" +msgstr "未支援的裝置類型「%s」" #: ../thunar-volman/tvm-input-device.c:75 msgid "Keyboard detected" @@ -247,8 +246,8 @@ #: ../thunar-volman/tvm-input-device.c:141 #, c-format -msgid "Unsupported input device type" -msgstr "未支援的輸入裝置類型" +msgid "Unsupported input device type \"%s\"" +msgstr "未支援的輸入裝置類型「%s」" #: ../thunar-volman/tvm-run.c:171 #, c-format @@ -263,8 +262,7 @@ msgid "You have inserted a blank DVD." msgstr "您已置入一片空白 DVD。" -#: ../thunar-volman/tvm-run.c:191 -#: ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid "What would you like to do?" msgstr "接下來您要做什麼？" @@ -316,15 +314,15 @@ #: ../thunar-volman/tvm-usb-device.c:100 #, c-format -msgid "Unsupported USB device type" -msgstr "未支援的 USB 裝置類型" +msgid "Unsupported USB device type \"%s\"" +msgstr "未支援的 USB 裝置類型「%s」" #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" msgstr "Thunar 儲存裝置管理員設定值" -#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 +#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 msgid "Removable Drives and Media" msgstr "可移除裝置與媒體" @@ -357,9 +355,8 @@ msgid "Shell Scripts" msgstr "Shell 指令稿" -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid "Storage" msgstr "儲存裝置" @@ -404,9 +401,8 @@ msgid "Command for A_udio CDs:" msgstr "音訊 CD 所用指令(_U)：" -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid "Multimedia" msgstr "多媒體" @@ -450,9 +446,8 @@ msgid "Play _music files when connected" msgstr "連接時播放音樂檔(_M)" -#. #. Cameras -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:379 msgid "Cameras" msgstr "相機" @@ -465,9 +460,8 @@ msgid "Import digital photographs when connected" msgstr "連接時匯入數位相片" -#. #. PDAs -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:427 msgid "PDAs" msgstr "PDA" @@ -488,9 +482,8 @@ msgid "Sync Pocket P_C devices when connected" msgstr "連接時同步 Pocket PC 裝置(_C)" -#. #. Printers -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:517 #: ../thunar-volman-settings/tvm-preferences-dialog.c:528 msgid "Printers" @@ -500,9 +493,8 @@ msgid "Automatically run a program when a _printer is connected" msgstr "連接印表機時自動執行程式(_P)" -#. #. Input Devices -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:565 msgid "Input Devices" msgstr "輸入裝置" @@ -538,33 +530,3 @@ #: ../thunar-volman-settings/tvm-preferences-dialog.c:755 msgid "Failed to open the documentation browser" msgstr "無法開啟文件瀏覽器" - -#~ msgid "input-keyboard" -#~ msgstr "鍵盤輸入" - -#~ msgid "input-tablet" -#~ msgstr "平板輸入" - -#~ msgid "input-mouse" -#~ msgstr "滑鼠輸入" - -#~ msgid "Failed to open display" -#~ msgstr "無法開啟顯示" - -#~ msgid "The Thunar development team. All rights reserved." -#~ msgstr "Thunar 開發團隊。保留一切權利。" - -#~ msgid "Written by Benedikt Meurer ." -#~ msgstr "由 Benedikt Meurer 開發 。" - -#~ msgid "The specified UDI \"%s\" is not a valid HAL device UDI" -#~ msgstr "指定的 UDI \"%s\" 並非有效的 HAL 裝置 UDI" - -#~ msgid "Choose Disc Type" -#~ msgstr "請選擇光碟類型" - -#~ msgid "Make _DVD" -#~ msgstr "製作 DVD (_D)" - -#~ msgid "Removable Media" -#~ msgstr "可移除裝置與媒體" diff -Nru thunar-volman-0.6.1/thunar-volman/main.c thunar-volman-0.8.1/thunar-volman/main.c --- thunar-volman-0.6.1/thunar-volman/main.c 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman/main.c 2015-02-26 13:26:46.000000000 +0000 @@ -56,7 +56,7 @@ /* command line options */ static GOptionEntry option_entries[] = { - { "device-added", 'a', 0, G_OPTION_ARG_STRING, &opt_sysfs_path, N_ ("The syfs path of the newly added device"), NULL, }, + { "device-added", 'a', 0, G_OPTION_ARG_STRING, &opt_sysfs_path, N_ ("The sysfs path of the newly added device"), NULL, }, { "configure", 'c', 0, G_OPTION_ARG_NONE, &opt_configure, N_ ("Configure management of removable drives and media"), NULL, }, { "version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, N_ ("Print version information and exit"), NULL, }, { NULL, }, @@ -97,9 +97,11 @@ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); #endif +#if !GLIB_CHECK_VERSION (2, 32, 0) /* initialize the threading system */ if (!g_thread_supported ()) g_thread_init (NULL); +#endif /* initialize GTK+ */ if (!gtk_init_with_args (&argc, &argv, NULL, option_entries, GETTEXT_PACKAGE, &error)) diff -Nru thunar-volman-0.6.1/thunar-volman/Makefile.am thunar-volman-0.8.1/thunar-volman/Makefile.am --- thunar-volman-0.6.1/thunar-volman/Makefile.am 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman/Makefile.am 2015-02-26 13:26:46.000000000 +0000 @@ -17,7 +17,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DBINDIR=\"$(bindir)\" \ diff -Nru thunar-volman-0.6.1/thunar-volman/Makefile.in thunar-volman-0.8.1/thunar-volman/Makefile.in --- thunar-volman-0.6.1/thunar-volman/Makefile.in 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman/Makefile.in 2015-02-28 17:59:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -35,6 +34,51 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,12 +100,13 @@ target_triplet = @target@ bin_PROGRAMS = thunar-volman$(EXEEXT) subdir = thunar-volman -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -93,24 +138,71 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -thunar_volman_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +thunar_volman_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(thunar_volman_CFLAGS) \ $(CFLAGS) $(thunar_volman_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(thunar_volman_SOURCES) DIST_SOURCES = $(am__thunar_volman_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -206,6 +298,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -309,7 +402,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DBINDIR=\"$(bindir)\" \ @@ -406,14 +499,19 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -434,7 +532,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -447,9 +546,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + thunar-volman$(EXEEXT): $(thunar_volman_OBJECTS) $(thunar_volman_DEPENDENCIES) $(EXTRA_thunar_volman_DEPENDENCIES) @rm -f thunar-volman$(EXEEXT) - $(thunar_volman_LINK) $(thunar_volman_OBJECTS) $(thunar_volman_LDADD) $(LIBS) + $(AM_V_CCLD)$(thunar_volman_LINK) $(thunar_volman_OBJECTS) $(thunar_volman_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -470,179 +570,179 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thunar_volman-tvm-usb-device.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< thunar_volman-main.o: main.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-main.o -MD -MP -MF $(DEPDIR)/thunar_volman-main.Tpo -c -o thunar_volman-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-main.Tpo $(DEPDIR)/thunar_volman-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='thunar_volman-main.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-main.o -MD -MP -MF $(DEPDIR)/thunar_volman-main.Tpo -c -o thunar_volman-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-main.Tpo $(DEPDIR)/thunar_volman-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='thunar_volman-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c thunar_volman-main.obj: main.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-main.obj -MD -MP -MF $(DEPDIR)/thunar_volman-main.Tpo -c -o thunar_volman-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-main.Tpo $(DEPDIR)/thunar_volman-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='thunar_volman-main.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-main.obj -MD -MP -MF $(DEPDIR)/thunar_volman-main.Tpo -c -o thunar_volman-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-main.Tpo $(DEPDIR)/thunar_volman-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='thunar_volman-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` thunar_volman-tvm-block-device.o: tvm-block-device.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-block-device.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-block-device.Tpo -c -o thunar_volman-tvm-block-device.o `test -f 'tvm-block-device.c' || echo '$(srcdir)/'`tvm-block-device.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-block-device.Tpo $(DEPDIR)/thunar_volman-tvm-block-device.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-block-device.c' object='thunar_volman-tvm-block-device.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-block-device.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-block-device.Tpo -c -o thunar_volman-tvm-block-device.o `test -f 'tvm-block-device.c' || echo '$(srcdir)/'`tvm-block-device.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-block-device.Tpo $(DEPDIR)/thunar_volman-tvm-block-device.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-block-device.c' object='thunar_volman-tvm-block-device.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-block-device.o `test -f 'tvm-block-device.c' || echo '$(srcdir)/'`tvm-block-device.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-block-device.o `test -f 'tvm-block-device.c' || echo '$(srcdir)/'`tvm-block-device.c thunar_volman-tvm-block-device.obj: tvm-block-device.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-block-device.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-block-device.Tpo -c -o thunar_volman-tvm-block-device.obj `if test -f 'tvm-block-device.c'; then $(CYGPATH_W) 'tvm-block-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-block-device.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-block-device.Tpo $(DEPDIR)/thunar_volman-tvm-block-device.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-block-device.c' object='thunar_volman-tvm-block-device.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-block-device.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-block-device.Tpo -c -o thunar_volman-tvm-block-device.obj `if test -f 'tvm-block-device.c'; then $(CYGPATH_W) 'tvm-block-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-block-device.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-block-device.Tpo $(DEPDIR)/thunar_volman-tvm-block-device.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-block-device.c' object='thunar_volman-tvm-block-device.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-block-device.obj `if test -f 'tvm-block-device.c'; then $(CYGPATH_W) 'tvm-block-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-block-device.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-block-device.obj `if test -f 'tvm-block-device.c'; then $(CYGPATH_W) 'tvm-block-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-block-device.c'; fi` thunar_volman-tvm-context.o: tvm-context.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-context.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-context.Tpo -c -o thunar_volman-tvm-context.o `test -f 'tvm-context.c' || echo '$(srcdir)/'`tvm-context.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-context.Tpo $(DEPDIR)/thunar_volman-tvm-context.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-context.c' object='thunar_volman-tvm-context.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-context.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-context.Tpo -c -o thunar_volman-tvm-context.o `test -f 'tvm-context.c' || echo '$(srcdir)/'`tvm-context.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-context.Tpo $(DEPDIR)/thunar_volman-tvm-context.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-context.c' object='thunar_volman-tvm-context.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-context.o `test -f 'tvm-context.c' || echo '$(srcdir)/'`tvm-context.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-context.o `test -f 'tvm-context.c' || echo '$(srcdir)/'`tvm-context.c thunar_volman-tvm-context.obj: tvm-context.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-context.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-context.Tpo -c -o thunar_volman-tvm-context.obj `if test -f 'tvm-context.c'; then $(CYGPATH_W) 'tvm-context.c'; else $(CYGPATH_W) '$(srcdir)/tvm-context.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-context.Tpo $(DEPDIR)/thunar_volman-tvm-context.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-context.c' object='thunar_volman-tvm-context.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-context.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-context.Tpo -c -o thunar_volman-tvm-context.obj `if test -f 'tvm-context.c'; then $(CYGPATH_W) 'tvm-context.c'; else $(CYGPATH_W) '$(srcdir)/tvm-context.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-context.Tpo $(DEPDIR)/thunar_volman-tvm-context.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-context.c' object='thunar_volman-tvm-context.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-context.obj `if test -f 'tvm-context.c'; then $(CYGPATH_W) 'tvm-context.c'; else $(CYGPATH_W) '$(srcdir)/tvm-context.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-context.obj `if test -f 'tvm-context.c'; then $(CYGPATH_W) 'tvm-context.c'; else $(CYGPATH_W) '$(srcdir)/tvm-context.c'; fi` thunar_volman-tvm-device.o: tvm-device.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-device.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-device.Tpo -c -o thunar_volman-tvm-device.o `test -f 'tvm-device.c' || echo '$(srcdir)/'`tvm-device.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-device.Tpo $(DEPDIR)/thunar_volman-tvm-device.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-device.c' object='thunar_volman-tvm-device.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-device.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-device.Tpo -c -o thunar_volman-tvm-device.o `test -f 'tvm-device.c' || echo '$(srcdir)/'`tvm-device.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-device.Tpo $(DEPDIR)/thunar_volman-tvm-device.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-device.c' object='thunar_volman-tvm-device.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-device.o `test -f 'tvm-device.c' || echo '$(srcdir)/'`tvm-device.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-device.o `test -f 'tvm-device.c' || echo '$(srcdir)/'`tvm-device.c thunar_volman-tvm-device.obj: tvm-device.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-device.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-device.Tpo -c -o thunar_volman-tvm-device.obj `if test -f 'tvm-device.c'; then $(CYGPATH_W) 'tvm-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-device.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-device.Tpo $(DEPDIR)/thunar_volman-tvm-device.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-device.c' object='thunar_volman-tvm-device.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-device.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-device.Tpo -c -o thunar_volman-tvm-device.obj `if test -f 'tvm-device.c'; then $(CYGPATH_W) 'tvm-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-device.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-device.Tpo $(DEPDIR)/thunar_volman-tvm-device.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-device.c' object='thunar_volman-tvm-device.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-device.obj `if test -f 'tvm-device.c'; then $(CYGPATH_W) 'tvm-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-device.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-device.obj `if test -f 'tvm-device.c'; then $(CYGPATH_W) 'tvm-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-device.c'; fi` thunar_volman-tvm-gio-extensions.o: tvm-gio-extensions.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-gio-extensions.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-gio-extensions.Tpo -c -o thunar_volman-tvm-gio-extensions.o `test -f 'tvm-gio-extensions.c' || echo '$(srcdir)/'`tvm-gio-extensions.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-gio-extensions.Tpo $(DEPDIR)/thunar_volman-tvm-gio-extensions.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-gio-extensions.c' object='thunar_volman-tvm-gio-extensions.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-gio-extensions.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-gio-extensions.Tpo -c -o thunar_volman-tvm-gio-extensions.o `test -f 'tvm-gio-extensions.c' || echo '$(srcdir)/'`tvm-gio-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-gio-extensions.Tpo $(DEPDIR)/thunar_volman-tvm-gio-extensions.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-gio-extensions.c' object='thunar_volman-tvm-gio-extensions.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-gio-extensions.o `test -f 'tvm-gio-extensions.c' || echo '$(srcdir)/'`tvm-gio-extensions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-gio-extensions.o `test -f 'tvm-gio-extensions.c' || echo '$(srcdir)/'`tvm-gio-extensions.c thunar_volman-tvm-gio-extensions.obj: tvm-gio-extensions.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-gio-extensions.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-gio-extensions.Tpo -c -o thunar_volman-tvm-gio-extensions.obj `if test -f 'tvm-gio-extensions.c'; then $(CYGPATH_W) 'tvm-gio-extensions.c'; else $(CYGPATH_W) '$(srcdir)/tvm-gio-extensions.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-gio-extensions.Tpo $(DEPDIR)/thunar_volman-tvm-gio-extensions.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-gio-extensions.c' object='thunar_volman-tvm-gio-extensions.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-gio-extensions.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-gio-extensions.Tpo -c -o thunar_volman-tvm-gio-extensions.obj `if test -f 'tvm-gio-extensions.c'; then $(CYGPATH_W) 'tvm-gio-extensions.c'; else $(CYGPATH_W) '$(srcdir)/tvm-gio-extensions.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-gio-extensions.Tpo $(DEPDIR)/thunar_volman-tvm-gio-extensions.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-gio-extensions.c' object='thunar_volman-tvm-gio-extensions.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-gio-extensions.obj `if test -f 'tvm-gio-extensions.c'; then $(CYGPATH_W) 'tvm-gio-extensions.c'; else $(CYGPATH_W) '$(srcdir)/tvm-gio-extensions.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-gio-extensions.obj `if test -f 'tvm-gio-extensions.c'; then $(CYGPATH_W) 'tvm-gio-extensions.c'; else $(CYGPATH_W) '$(srcdir)/tvm-gio-extensions.c'; fi` thunar_volman-tvm-input-device.o: tvm-input-device.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-input-device.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-input-device.Tpo -c -o thunar_volman-tvm-input-device.o `test -f 'tvm-input-device.c' || echo '$(srcdir)/'`tvm-input-device.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-input-device.Tpo $(DEPDIR)/thunar_volman-tvm-input-device.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-input-device.c' object='thunar_volman-tvm-input-device.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-input-device.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-input-device.Tpo -c -o thunar_volman-tvm-input-device.o `test -f 'tvm-input-device.c' || echo '$(srcdir)/'`tvm-input-device.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-input-device.Tpo $(DEPDIR)/thunar_volman-tvm-input-device.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-input-device.c' object='thunar_volman-tvm-input-device.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-input-device.o `test -f 'tvm-input-device.c' || echo '$(srcdir)/'`tvm-input-device.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-input-device.o `test -f 'tvm-input-device.c' || echo '$(srcdir)/'`tvm-input-device.c thunar_volman-tvm-input-device.obj: tvm-input-device.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-input-device.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-input-device.Tpo -c -o thunar_volman-tvm-input-device.obj `if test -f 'tvm-input-device.c'; then $(CYGPATH_W) 'tvm-input-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-input-device.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-input-device.Tpo $(DEPDIR)/thunar_volman-tvm-input-device.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-input-device.c' object='thunar_volman-tvm-input-device.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-input-device.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-input-device.Tpo -c -o thunar_volman-tvm-input-device.obj `if test -f 'tvm-input-device.c'; then $(CYGPATH_W) 'tvm-input-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-input-device.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-input-device.Tpo $(DEPDIR)/thunar_volman-tvm-input-device.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-input-device.c' object='thunar_volman-tvm-input-device.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-input-device.obj `if test -f 'tvm-input-device.c'; then $(CYGPATH_W) 'tvm-input-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-input-device.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-input-device.obj `if test -f 'tvm-input-device.c'; then $(CYGPATH_W) 'tvm-input-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-input-device.c'; fi` thunar_volman-tvm-pango-extensions.o: tvm-pango-extensions.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-pango-extensions.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-pango-extensions.Tpo -c -o thunar_volman-tvm-pango-extensions.o `test -f 'tvm-pango-extensions.c' || echo '$(srcdir)/'`tvm-pango-extensions.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-pango-extensions.Tpo $(DEPDIR)/thunar_volman-tvm-pango-extensions.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-pango-extensions.c' object='thunar_volman-tvm-pango-extensions.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-pango-extensions.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-pango-extensions.Tpo -c -o thunar_volman-tvm-pango-extensions.o `test -f 'tvm-pango-extensions.c' || echo '$(srcdir)/'`tvm-pango-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-pango-extensions.Tpo $(DEPDIR)/thunar_volman-tvm-pango-extensions.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-pango-extensions.c' object='thunar_volman-tvm-pango-extensions.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-pango-extensions.o `test -f 'tvm-pango-extensions.c' || echo '$(srcdir)/'`tvm-pango-extensions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-pango-extensions.o `test -f 'tvm-pango-extensions.c' || echo '$(srcdir)/'`tvm-pango-extensions.c thunar_volman-tvm-pango-extensions.obj: tvm-pango-extensions.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-pango-extensions.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-pango-extensions.Tpo -c -o thunar_volman-tvm-pango-extensions.obj `if test -f 'tvm-pango-extensions.c'; then $(CYGPATH_W) 'tvm-pango-extensions.c'; else $(CYGPATH_W) '$(srcdir)/tvm-pango-extensions.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-pango-extensions.Tpo $(DEPDIR)/thunar_volman-tvm-pango-extensions.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-pango-extensions.c' object='thunar_volman-tvm-pango-extensions.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-pango-extensions.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-pango-extensions.Tpo -c -o thunar_volman-tvm-pango-extensions.obj `if test -f 'tvm-pango-extensions.c'; then $(CYGPATH_W) 'tvm-pango-extensions.c'; else $(CYGPATH_W) '$(srcdir)/tvm-pango-extensions.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-pango-extensions.Tpo $(DEPDIR)/thunar_volman-tvm-pango-extensions.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-pango-extensions.c' object='thunar_volman-tvm-pango-extensions.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-pango-extensions.obj `if test -f 'tvm-pango-extensions.c'; then $(CYGPATH_W) 'tvm-pango-extensions.c'; else $(CYGPATH_W) '$(srcdir)/tvm-pango-extensions.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-pango-extensions.obj `if test -f 'tvm-pango-extensions.c'; then $(CYGPATH_W) 'tvm-pango-extensions.c'; else $(CYGPATH_W) '$(srcdir)/tvm-pango-extensions.c'; fi` thunar_volman-tvm-prompt.o: tvm-prompt.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-prompt.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-prompt.Tpo -c -o thunar_volman-tvm-prompt.o `test -f 'tvm-prompt.c' || echo '$(srcdir)/'`tvm-prompt.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-prompt.Tpo $(DEPDIR)/thunar_volman-tvm-prompt.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-prompt.c' object='thunar_volman-tvm-prompt.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-prompt.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-prompt.Tpo -c -o thunar_volman-tvm-prompt.o `test -f 'tvm-prompt.c' || echo '$(srcdir)/'`tvm-prompt.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-prompt.Tpo $(DEPDIR)/thunar_volman-tvm-prompt.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-prompt.c' object='thunar_volman-tvm-prompt.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-prompt.o `test -f 'tvm-prompt.c' || echo '$(srcdir)/'`tvm-prompt.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-prompt.o `test -f 'tvm-prompt.c' || echo '$(srcdir)/'`tvm-prompt.c thunar_volman-tvm-prompt.obj: tvm-prompt.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-prompt.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-prompt.Tpo -c -o thunar_volman-tvm-prompt.obj `if test -f 'tvm-prompt.c'; then $(CYGPATH_W) 'tvm-prompt.c'; else $(CYGPATH_W) '$(srcdir)/tvm-prompt.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-prompt.Tpo $(DEPDIR)/thunar_volman-tvm-prompt.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-prompt.c' object='thunar_volman-tvm-prompt.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-prompt.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-prompt.Tpo -c -o thunar_volman-tvm-prompt.obj `if test -f 'tvm-prompt.c'; then $(CYGPATH_W) 'tvm-prompt.c'; else $(CYGPATH_W) '$(srcdir)/tvm-prompt.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-prompt.Tpo $(DEPDIR)/thunar_volman-tvm-prompt.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-prompt.c' object='thunar_volman-tvm-prompt.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-prompt.obj `if test -f 'tvm-prompt.c'; then $(CYGPATH_W) 'tvm-prompt.c'; else $(CYGPATH_W) '$(srcdir)/tvm-prompt.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-prompt.obj `if test -f 'tvm-prompt.c'; then $(CYGPATH_W) 'tvm-prompt.c'; else $(CYGPATH_W) '$(srcdir)/tvm-prompt.c'; fi` thunar_volman-tvm-run.o: tvm-run.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-run.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-run.Tpo -c -o thunar_volman-tvm-run.o `test -f 'tvm-run.c' || echo '$(srcdir)/'`tvm-run.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-run.Tpo $(DEPDIR)/thunar_volman-tvm-run.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-run.c' object='thunar_volman-tvm-run.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-run.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-run.Tpo -c -o thunar_volman-tvm-run.o `test -f 'tvm-run.c' || echo '$(srcdir)/'`tvm-run.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-run.Tpo $(DEPDIR)/thunar_volman-tvm-run.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-run.c' object='thunar_volman-tvm-run.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-run.o `test -f 'tvm-run.c' || echo '$(srcdir)/'`tvm-run.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-run.o `test -f 'tvm-run.c' || echo '$(srcdir)/'`tvm-run.c thunar_volman-tvm-run.obj: tvm-run.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-run.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-run.Tpo -c -o thunar_volman-tvm-run.obj `if test -f 'tvm-run.c'; then $(CYGPATH_W) 'tvm-run.c'; else $(CYGPATH_W) '$(srcdir)/tvm-run.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-run.Tpo $(DEPDIR)/thunar_volman-tvm-run.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-run.c' object='thunar_volman-tvm-run.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-run.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-run.Tpo -c -o thunar_volman-tvm-run.obj `if test -f 'tvm-run.c'; then $(CYGPATH_W) 'tvm-run.c'; else $(CYGPATH_W) '$(srcdir)/tvm-run.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-run.Tpo $(DEPDIR)/thunar_volman-tvm-run.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-run.c' object='thunar_volman-tvm-run.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-run.obj `if test -f 'tvm-run.c'; then $(CYGPATH_W) 'tvm-run.c'; else $(CYGPATH_W) '$(srcdir)/tvm-run.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-run.obj `if test -f 'tvm-run.c'; then $(CYGPATH_W) 'tvm-run.c'; else $(CYGPATH_W) '$(srcdir)/tvm-run.c'; fi` thunar_volman-tvm-usb-device.o: tvm-usb-device.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-usb-device.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-usb-device.Tpo -c -o thunar_volman-tvm-usb-device.o `test -f 'tvm-usb-device.c' || echo '$(srcdir)/'`tvm-usb-device.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-usb-device.Tpo $(DEPDIR)/thunar_volman-tvm-usb-device.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-usb-device.c' object='thunar_volman-tvm-usb-device.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-usb-device.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-usb-device.Tpo -c -o thunar_volman-tvm-usb-device.o `test -f 'tvm-usb-device.c' || echo '$(srcdir)/'`tvm-usb-device.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-usb-device.Tpo $(DEPDIR)/thunar_volman-tvm-usb-device.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-usb-device.c' object='thunar_volman-tvm-usb-device.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-usb-device.o `test -f 'tvm-usb-device.c' || echo '$(srcdir)/'`tvm-usb-device.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-usb-device.o `test -f 'tvm-usb-device.c' || echo '$(srcdir)/'`tvm-usb-device.c thunar_volman-tvm-usb-device.obj: tvm-usb-device.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-usb-device.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-usb-device.Tpo -c -o thunar_volman-tvm-usb-device.obj `if test -f 'tvm-usb-device.c'; then $(CYGPATH_W) 'tvm-usb-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-usb-device.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-usb-device.Tpo $(DEPDIR)/thunar_volman-tvm-usb-device.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-usb-device.c' object='thunar_volman-tvm-usb-device.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-usb-device.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-usb-device.Tpo -c -o thunar_volman-tvm-usb-device.obj `if test -f 'tvm-usb-device.c'; then $(CYGPATH_W) 'tvm-usb-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-usb-device.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-usb-device.Tpo $(DEPDIR)/thunar_volman-tvm-usb-device.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-usb-device.c' object='thunar_volman-tvm-usb-device.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-usb-device.obj `if test -f 'tvm-usb-device.c'; then $(CYGPATH_W) 'tvm-usb-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-usb-device.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-usb-device.obj `if test -f 'tvm-usb-device.c'; then $(CYGPATH_W) 'tvm-usb-device.c'; else $(CYGPATH_W) '$(srcdir)/tvm-usb-device.c'; fi` thunar_volman-tvm-notify.o: tvm-notify.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-notify.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-notify.Tpo -c -o thunar_volman-tvm-notify.o `test -f 'tvm-notify.c' || echo '$(srcdir)/'`tvm-notify.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-notify.Tpo $(DEPDIR)/thunar_volman-tvm-notify.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-notify.c' object='thunar_volman-tvm-notify.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-notify.o -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-notify.Tpo -c -o thunar_volman-tvm-notify.o `test -f 'tvm-notify.c' || echo '$(srcdir)/'`tvm-notify.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-notify.Tpo $(DEPDIR)/thunar_volman-tvm-notify.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-notify.c' object='thunar_volman-tvm-notify.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-notify.o `test -f 'tvm-notify.c' || echo '$(srcdir)/'`tvm-notify.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-notify.o `test -f 'tvm-notify.c' || echo '$(srcdir)/'`tvm-notify.c thunar_volman-tvm-notify.obj: tvm-notify.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-notify.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-notify.Tpo -c -o thunar_volman-tvm-notify.obj `if test -f 'tvm-notify.c'; then $(CYGPATH_W) 'tvm-notify.c'; else $(CYGPATH_W) '$(srcdir)/tvm-notify.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman-tvm-notify.Tpo $(DEPDIR)/thunar_volman-tvm-notify.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-notify.c' object='thunar_volman-tvm-notify.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -MT thunar_volman-tvm-notify.obj -MD -MP -MF $(DEPDIR)/thunar_volman-tvm-notify.Tpo -c -o thunar_volman-tvm-notify.obj `if test -f 'tvm-notify.c'; then $(CYGPATH_W) 'tvm-notify.c'; else $(CYGPATH_W) '$(srcdir)/tvm-notify.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman-tvm-notify.Tpo $(DEPDIR)/thunar_volman-tvm-notify.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-notify.c' object='thunar_volman-tvm-notify.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-notify.obj `if test -f 'tvm-notify.c'; then $(CYGPATH_W) 'tvm-notify.c'; else $(CYGPATH_W) '$(srcdir)/tvm-notify.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_CFLAGS) $(CFLAGS) -c -o thunar_volman-tvm-notify.obj `if test -f 'tvm-notify.c'; then $(CYGPATH_W) 'tvm-notify.c'; else $(CYGPATH_W) '$(srcdir)/tvm-notify.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -650,26 +750,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -681,15 +770,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -698,6 +783,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -841,19 +941,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru thunar-volman-0.6.1/thunar-volman/tvm-block-device.c thunar-volman-0.8.1/thunar-volman/tvm-block-device.c --- thunar-volman-0.6.1/thunar-volman/tvm-block-device.c 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman/tvm-block-device.c 2015-02-28 17:58:42.000000000 +0000 @@ -708,7 +708,7 @@ -static void +static gboolean tvm_block_device_mount (TvmContext *context) { GMountOperation *mount_operation; @@ -751,6 +751,7 @@ /* finish processing the device */ tvm_device_handler_finished (context); } + return FALSE; } @@ -881,7 +882,7 @@ if (automount) { /* mount the CD/DVD and continue with inspecting its contents */ - tvm_block_device_mount (context); + g_timeout_add_seconds(5, (GSourceFunc) tvm_block_device_mount, context); } } else @@ -904,7 +905,7 @@ if (automount) { /* mount the partition and continue with inspecting its contents */ - tvm_block_device_mount (context); + g_timeout_add_seconds(5, (GSourceFunc) tvm_block_device_mount, context); } else { @@ -916,7 +917,7 @@ { /* generate an error for logging */ g_set_error (context->error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Unknown block device type")); + _("Unknown block device type \"%s\""), devtype); /* finish processing the device */ tvm_device_handler_finished (context); diff -Nru thunar-volman-0.6.1/thunar-volman/tvm-device.c thunar-volman-0.8.1/thunar-volman/tvm-device.c --- thunar-volman-0.6.1/thunar-volman/tvm-device.c 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman/tvm-device.c 2015-02-26 13:26:46.000000000 +0000 @@ -136,7 +136,8 @@ else { g_set_error (context->error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Device type not supported")); + _("Device type \"%s\" not supported"), + g_udev_device_get_property (context->device, "DEVNAME")); g_main_loop_quit (context->loop); } } diff -Nru thunar-volman-0.6.1/thunar-volman/tvm-input-device.c thunar-volman-0.8.1/thunar-volman/tvm-input-device.c --- thunar-volman-0.6.1/thunar-volman/tvm-input-device.c 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman/tvm-input-device.c 2015-02-26 13:26:46.000000000 +0000 @@ -138,7 +138,7 @@ { /* return an error because we cannot handle the input device */ g_set_error (context->error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Unsupported input device type")); + _("Unsupported input device type \"%s\""), devname); } /* finish processing the device */ diff -Nru thunar-volman-0.6.1/thunar-volman/tvm-usb-device.c thunar-volman-0.8.1/thunar-volman/tvm-usb-device.c --- thunar-volman-0.6.1/thunar-volman/tvm-usb-device.c 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman/tvm-usb-device.c 2015-02-26 13:26:46.000000000 +0000 @@ -97,7 +97,7 @@ { /* return an error because we cannot handle the usb device */ g_set_error (context->error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Unsupported USB device type")); + _("Unsupported USB device type \"%s\""), driver); } /* finish processing the device */ diff -Nru thunar-volman-0.6.1/thunar-volman-settings/main.c thunar-volman-0.8.1/thunar-volman-settings/main.c --- thunar-volman-0.6.1/thunar-volman-settings/main.c 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman-settings/main.c 2015-02-26 13:26:46.000000000 +0000 @@ -56,9 +56,11 @@ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); #endif +#if !GLIB_CHECK_VERSION (2, 32, 0) /* initialize the threading system */ if (!g_thread_supported ()) g_thread_init (NULL); +#endif /* initialize GTK+ */ if (!gtk_init_with_args (&argc, &argv, NULL, NULL, GETTEXT_PACKAGE, &error)) diff -Nru thunar-volman-0.6.1/thunar-volman-settings/Makefile.am thunar-volman-0.8.1/thunar-volman-settings/Makefile.am --- thunar-volman-0.6.1/thunar-volman-settings/Makefile.am 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman-settings/Makefile.am 2015-02-26 13:26:46.000000000 +0000 @@ -17,7 +17,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DBINDIR=\"$(bindir)\" \ diff -Nru thunar-volman-0.6.1/thunar-volman-settings/Makefile.in thunar-volman-0.8.1/thunar-volman-settings/Makefile.in --- thunar-volman-0.6.1/thunar-volman-settings/Makefile.in 2012-03-28 16:34:46.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman-settings/Makefile.in 2015-02-28 17:59:10.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -36,6 +35,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,12 +101,13 @@ target_triplet = @target@ bin_PROGRAMS = thunar-volman-settings$(EXEEXT) subdir = thunar-volman-settings -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -79,25 +124,55 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -thunar_volman_settings_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +thunar_volman_settings_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(thunar_volman_settings_CFLAGS) $(CFLAGS) \ $(thunar_volman_settings_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(thunar_volman_settings_SOURCES) DIST_SOURCES = $(thunar_volman_settings_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -126,6 +201,23 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } DATA = $(desktop_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -221,6 +313,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -324,7 +417,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DBINDIR=\"$(bindir)\" \ @@ -412,14 +505,19 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -440,7 +538,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -453,9 +552,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + thunar-volman-settings$(EXEEXT): $(thunar_volman_settings_OBJECTS) $(thunar_volman_settings_DEPENDENCIES) $(EXTRA_thunar_volman_settings_DEPENDENCIES) @rm -f thunar-volman-settings$(EXEEXT) - $(thunar_volman_settings_LINK) $(thunar_volman_settings_OBJECTS) $(thunar_volman_settings_LDADD) $(LIBS) + $(AM_V_CCLD)$(thunar_volman_settings_LINK) $(thunar_volman_settings_OBJECTS) $(thunar_volman_settings_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -469,81 +569,81 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< thunar_volman_settings-main.o: main.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-main.o -MD -MP -MF $(DEPDIR)/thunar_volman_settings-main.Tpo -c -o thunar_volman_settings-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman_settings-main.Tpo $(DEPDIR)/thunar_volman_settings-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='thunar_volman_settings-main.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-main.o -MD -MP -MF $(DEPDIR)/thunar_volman_settings-main.Tpo -c -o thunar_volman_settings-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman_settings-main.Tpo $(DEPDIR)/thunar_volman_settings-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='thunar_volman_settings-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c thunar_volman_settings-main.obj: main.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-main.obj -MD -MP -MF $(DEPDIR)/thunar_volman_settings-main.Tpo -c -o thunar_volman_settings-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman_settings-main.Tpo $(DEPDIR)/thunar_volman_settings-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='thunar_volman_settings-main.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-main.obj -MD -MP -MF $(DEPDIR)/thunar_volman_settings-main.Tpo -c -o thunar_volman_settings-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman_settings-main.Tpo $(DEPDIR)/thunar_volman_settings-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='thunar_volman_settings-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` thunar_volman_settings-tvm-command-entry.o: tvm-command-entry.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-command-entry.o -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Tpo -c -o thunar_volman_settings-tvm-command-entry.o `test -f 'tvm-command-entry.c' || echo '$(srcdir)/'`tvm-command-entry.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Tpo $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-command-entry.c' object='thunar_volman_settings-tvm-command-entry.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-command-entry.o -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Tpo -c -o thunar_volman_settings-tvm-command-entry.o `test -f 'tvm-command-entry.c' || echo '$(srcdir)/'`tvm-command-entry.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Tpo $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-command-entry.c' object='thunar_volman_settings-tvm-command-entry.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-command-entry.o `test -f 'tvm-command-entry.c' || echo '$(srcdir)/'`tvm-command-entry.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-command-entry.o `test -f 'tvm-command-entry.c' || echo '$(srcdir)/'`tvm-command-entry.c thunar_volman_settings-tvm-command-entry.obj: tvm-command-entry.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-command-entry.obj -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Tpo -c -o thunar_volman_settings-tvm-command-entry.obj `if test -f 'tvm-command-entry.c'; then $(CYGPATH_W) 'tvm-command-entry.c'; else $(CYGPATH_W) '$(srcdir)/tvm-command-entry.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Tpo $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-command-entry.c' object='thunar_volman_settings-tvm-command-entry.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-command-entry.obj -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Tpo -c -o thunar_volman_settings-tvm-command-entry.obj `if test -f 'tvm-command-entry.c'; then $(CYGPATH_W) 'tvm-command-entry.c'; else $(CYGPATH_W) '$(srcdir)/tvm-command-entry.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Tpo $(DEPDIR)/thunar_volman_settings-tvm-command-entry.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-command-entry.c' object='thunar_volman_settings-tvm-command-entry.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-command-entry.obj `if test -f 'tvm-command-entry.c'; then $(CYGPATH_W) 'tvm-command-entry.c'; else $(CYGPATH_W) '$(srcdir)/tvm-command-entry.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-command-entry.obj `if test -f 'tvm-command-entry.c'; then $(CYGPATH_W) 'tvm-command-entry.c'; else $(CYGPATH_W) '$(srcdir)/tvm-command-entry.c'; fi` thunar_volman_settings-tvm-preferences-dialog.o: tvm-preferences-dialog.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-preferences-dialog.o -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Tpo -c -o thunar_volman_settings-tvm-preferences-dialog.o `test -f 'tvm-preferences-dialog.c' || echo '$(srcdir)/'`tvm-preferences-dialog.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Tpo $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-preferences-dialog.c' object='thunar_volman_settings-tvm-preferences-dialog.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-preferences-dialog.o -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Tpo -c -o thunar_volman_settings-tvm-preferences-dialog.o `test -f 'tvm-preferences-dialog.c' || echo '$(srcdir)/'`tvm-preferences-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Tpo $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-preferences-dialog.c' object='thunar_volman_settings-tvm-preferences-dialog.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-preferences-dialog.o `test -f 'tvm-preferences-dialog.c' || echo '$(srcdir)/'`tvm-preferences-dialog.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-preferences-dialog.o `test -f 'tvm-preferences-dialog.c' || echo '$(srcdir)/'`tvm-preferences-dialog.c thunar_volman_settings-tvm-preferences-dialog.obj: tvm-preferences-dialog.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-preferences-dialog.obj -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Tpo -c -o thunar_volman_settings-tvm-preferences-dialog.obj `if test -f 'tvm-preferences-dialog.c'; then $(CYGPATH_W) 'tvm-preferences-dialog.c'; else $(CYGPATH_W) '$(srcdir)/tvm-preferences-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Tpo $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tvm-preferences-dialog.c' object='thunar_volman_settings-tvm-preferences-dialog.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-preferences-dialog.obj -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Tpo -c -o thunar_volman_settings-tvm-preferences-dialog.obj `if test -f 'tvm-preferences-dialog.c'; then $(CYGPATH_W) 'tvm-preferences-dialog.c'; else $(CYGPATH_W) '$(srcdir)/tvm-preferences-dialog.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Tpo $(DEPDIR)/thunar_volman_settings-tvm-preferences-dialog.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tvm-preferences-dialog.c' object='thunar_volman_settings-tvm-preferences-dialog.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-preferences-dialog.obj `if test -f 'tvm-preferences-dialog.c'; then $(CYGPATH_W) 'tvm-preferences-dialog.c'; else $(CYGPATH_W) '$(srcdir)/tvm-preferences-dialog.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-preferences-dialog.obj `if test -f 'tvm-preferences-dialog.c'; then $(CYGPATH_W) 'tvm-preferences-dialog.c'; else $(CYGPATH_W) '$(srcdir)/tvm-preferences-dialog.c'; fi` thunar_volman_settings-tvm-pango-extensions.o: ../thunar-volman/tvm-pango-extensions.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-pango-extensions.o -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Tpo -c -o thunar_volman_settings-tvm-pango-extensions.o `test -f '../thunar-volman/tvm-pango-extensions.c' || echo '$(srcdir)/'`../thunar-volman/tvm-pango-extensions.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Tpo $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../thunar-volman/tvm-pango-extensions.c' object='thunar_volman_settings-tvm-pango-extensions.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-pango-extensions.o -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Tpo -c -o thunar_volman_settings-tvm-pango-extensions.o `test -f '../thunar-volman/tvm-pango-extensions.c' || echo '$(srcdir)/'`../thunar-volman/tvm-pango-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Tpo $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../thunar-volman/tvm-pango-extensions.c' object='thunar_volman_settings-tvm-pango-extensions.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-pango-extensions.o `test -f '../thunar-volman/tvm-pango-extensions.c' || echo '$(srcdir)/'`../thunar-volman/tvm-pango-extensions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-pango-extensions.o `test -f '../thunar-volman/tvm-pango-extensions.c' || echo '$(srcdir)/'`../thunar-volman/tvm-pango-extensions.c thunar_volman_settings-tvm-pango-extensions.obj: ../thunar-volman/tvm-pango-extensions.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-pango-extensions.obj -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Tpo -c -o thunar_volman_settings-tvm-pango-extensions.obj `if test -f '../thunar-volman/tvm-pango-extensions.c'; then $(CYGPATH_W) '../thunar-volman/tvm-pango-extensions.c'; else $(CYGPATH_W) '$(srcdir)/../thunar-volman/tvm-pango-extensions.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Tpo $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../thunar-volman/tvm-pango-extensions.c' object='thunar_volman_settings-tvm-pango-extensions.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -MT thunar_volman_settings-tvm-pango-extensions.obj -MD -MP -MF $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Tpo -c -o thunar_volman_settings-tvm-pango-extensions.obj `if test -f '../thunar-volman/tvm-pango-extensions.c'; then $(CYGPATH_W) '../thunar-volman/tvm-pango-extensions.c'; else $(CYGPATH_W) '$(srcdir)/../thunar-volman/tvm-pango-extensions.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Tpo $(DEPDIR)/thunar_volman_settings-tvm-pango-extensions.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../thunar-volman/tvm-pango-extensions.c' object='thunar_volman_settings-tvm-pango-extensions.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-pango-extensions.obj `if test -f '../thunar-volman/tvm-pango-extensions.c'; then $(CYGPATH_W) '../thunar-volman/tvm-pango-extensions.c'; else $(CYGPATH_W) '$(srcdir)/../thunar-volman/tvm-pango-extensions.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thunar_volman_settings_CFLAGS) $(CFLAGS) -c -o thunar_volman_settings-tvm-pango-extensions.obj `if test -f '../thunar-volman/tvm-pango-extensions.c'; then $(CYGPATH_W) '../thunar-volman/tvm-pango-extensions.c'; else $(CYGPATH_W) '$(srcdir)/../thunar-volman/tvm-pango-extensions.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -552,8 +652,11 @@ -rm -rf .libs _libs install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -569,26 +672,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -600,15 +692,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -617,6 +705,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -761,20 +864,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-desktopDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-desktopDATA +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-desktopDATA %.desktop.in: %.desktop.in.in sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ diff -Nru thunar-volman-0.6.1/thunar-volman-settings/thunar-volman-settings.desktop.in.in thunar-volman-0.8.1/thunar-volman-settings/thunar-volman-settings.desktop.in.in --- thunar-volman-0.6.1/thunar-volman-settings/thunar-volman-settings.desktop.in.in 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman-settings/thunar-volman-settings.desktop.in.in 2015-02-26 16:27:17.000000000 +0000 @@ -6,6 +6,6 @@ Terminal=false StartupNotify=true Type=Application -Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog; +Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings; # vi:set encoding=UTF-8: diff -Nru thunar-volman-0.6.1/thunar-volman-settings/tvm-preferences-dialog.c thunar-volman-0.8.1/thunar-volman-settings/tvm-preferences-dialog.c --- thunar-volman-0.6.1/thunar-volman-settings/tvm-preferences-dialog.c 2012-03-28 16:34:43.000000000 +0000 +++ thunar-volman-0.8.1/thunar-volman-settings/tvm-preferences-dialog.c 2015-02-26 15:14:26.000000000 +0000 @@ -692,76 +692,17 @@ tvm_preferences_dialog_help_clicked (GtkWidget *button, TvmPreferencesDialog *dialog) { - GtkWidget *message; - GError *err = NULL; - gchar **argv; - gchar *bindir; - gchar *prefix; - gchar *path; - g_return_if_fail (GTK_IS_BUTTON (button)); g_return_if_fail (TVM_IS_PREFERENCES_DIALOG (dialog)); - /* try to locate Thunar in the $PATH */ - path = g_find_program_in_path ("Thunar"); - if (G_UNLIKELY (path == NULL)) - path = g_find_program_in_path ("thunar"); - if (G_LIKELY (path != NULL)) - { - bindir = g_path_get_dirname (path); - prefix = g_path_get_dirname (bindir); - g_free (bindir); - g_free (path); - - /* now check if ThunarHelp is in $prefix/libexec */ - path = g_build_filename (prefix, "libexec", "ThunarHelp", NULL); - if (!g_file_test (path, G_FILE_TEST_IS_EXECUTABLE)) - { - /* release path */ - g_free (path); - - /* try to support Debian weirdness */ - path = g_build_filename (prefix, "lib", "thunar", "ThunarHelp", NULL); - if (!g_file_test (path, G_FILE_TEST_IS_EXECUTABLE)) - { - /* release path */ - g_free (path); - path = NULL; - } - } - } - - /* no ThunarHelp, weird! */ - if (G_UNLIKELY (path == NULL)) - path = g_strdup ("ThunarHelp"); - - /* prepare command to run help */ - argv = g_new (gchar *, 4); - argv[0] = path; - argv[1] = g_strdup ("using-removable-media"); - argv[2] = g_strdup ("management-of-removable-drives-and-media"); - argv[3] = NULL; - - /* try to open the user manual */ - if (!gdk_spawn_on_screen (gtk_widget_get_screen (button), NULL, argv, NULL, - G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err)) - { - /* display an error message to the user */ - message = gtk_message_dialog_new (GTK_WINDOW (dialog), - GTK_DIALOG_DESTROY_WITH_PARENT - | GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - _("Failed to open the documentation browser")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s", - err->message); - gtk_dialog_run (GTK_DIALOG (message)); - gtk_widget_destroy (message); - g_error_free (err); - } - - /* cleanup */ - g_strfreev (argv); +#if LIBXFCE4UI_CHECK_VERSION(4, 11, 1) + xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "thunar", + "using-removable-media", NULL, + TVM_VERSION_HELP); +#else + xfce_dialog_show_help (GTK_WINDOW (dialog), "thunar", + "using-removable-media", NULL); +#endif } diff -Nru thunar-volman-0.6.1/TODO thunar-volman-0.8.1/TODO --- thunar-volman-0.6.1/TODO 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.1/TODO 2015-02-26 17:10:20.000000000 +0000 @@ -0,0 +1,4 @@ +thunar-volman: Unsupported USB device type "usb". +thunar-volman: Unsupported USB device type "usb-storage". +thunar-volman: Unknown block device type "disk". +thunar-volman: Could not detect the volume corresponding to the device.