diff -Nru eog-plugins-3.1.2/aclocal.m4 eog-plugins-3.2.2/aclocal.m4 --- eog-plugins-3.1.2/aclocal.m4 2011-07-23 08:24:19.000000000 +0000 +++ eog-plugins-3.2.2/aclocal.m4 2011-10-20 10:37:41.000000000 +0000 @@ -19,1224 +19,526 @@ 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'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, 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_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.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _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.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. # -# 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. - -# 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/../..'. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. # -# 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. +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 # -# $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 +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 # -# 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. +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 # -# 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. +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 # -# 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` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Modified to require ngettext +# Matthias Clasen 08/06/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. +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -# serial 9 +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -# 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='#' +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) + +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) else - $1_TRUE='#' - $1_FALSE= + AC_MSG_RESULT(no) 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])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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. - -# serial 10 +AC_SUBST($1)dnl +]) -# 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... +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) + gt_cv_have_gettext=no -# _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. -# -# 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 + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -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=]) + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" -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'. - 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 - - 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 - - # 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 - ;; - 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]) -]) - - -# 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 -]) - - -# 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='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])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. - -#serial 5 - -# _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"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# 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. - -# serial 16 - -# 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. - -# 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 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]) - -# 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 - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])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([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 -]) - -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. - -# 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 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_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, 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. - -# serial 2 - -# 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, 1998, 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. - -# serial 5 - -# 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 am_maintainer_other 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 -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# 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. - -# serial 4 - -# 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 -*- - -# 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 - -# 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 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 -]) - -# Copyright (C) 2003, 2004, 2005, 2006 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_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 -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 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 4 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -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)]) - -# _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])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 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. - -# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# --------------------------------------------------------------------------- -# Adds support for distributing Python modules and packages. To -# install modules, copy them to $(pythondir), using the python_PYTHON -# automake variable. To install a package with the same name as the -# automake package, install to $(pkgpythondir), or use the -# pkgpython_PYTHON automake variable. -# -# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as -# locations to install python extension modules (shared libraries). -# Another macro is required to find the appropriate flags to compile -# extension modules. -# -# If your package is configured with a different prefix to python, -# users will have to add the install directory to the PYTHONPATH -# environment variable, or create a .pth file (see the python -# documentation for details). -# -# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will -# cause an error if the version of python installed on the system -# doesn't meet the requirement. MINIMUM-VERSION should consist of -# numbers and dots only. -AC_DEFUN([AM_PATH_PYTHON], - [ - dnl Find a Python interpreter. Python versions prior to 2.0 are not - dnl supported. (2.0 was released on October 16, 2000). - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl -python2.1 python2.0]) - - m4_if([$1],[],[ - dnl No version check is needed. - # Find any Python interpreter. - if test -z "$PYTHON"; then - AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) - fi - am_display_PYTHON=python - ], [ - dnl A version check is needed. - if test -n "$PYTHON"; then - # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) - AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) - am_display_PYTHON=$PYTHON - else - # Otherwise, try each interpreter until we find one that satisfies - # VERSION. - AC_CACHE_CHECK([for a Python interpreter with version >= $1], - [am_cv_pathless_PYTHON],[ - for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do - test "$am_cv_pathless_PYTHON" = none && break - AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) - done]) - # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. - if test "$am_cv_pathless_PYTHON" = none; then - PYTHON=: - else - AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) - fi - am_display_PYTHON=$am_cv_pathless_PYTHON - fi - ]) - - if test "$PYTHON" = :; then - dnl Run any user-specified action, or abort. - m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) - else - - dnl Query Python for its version number. Getting [:3] seems to be - dnl the best way to do this; it's what "site.py" does in the standard - dnl library. - - AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], - [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) - AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - - dnl Use the values of $prefix and $exec_prefix for the corresponding - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made - dnl distinct variables so they can be overridden if need be. However, - dnl general consensus is that you shouldn't need this ability. - - AC_SUBST([PYTHON_PREFIX], ['${prefix}']) - AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) - - dnl At times (like when building shared libraries) you may want - dnl to know which OS platform Python thinks this is. - - AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], - [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) - AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) - - - dnl Set up 4 directories: - - dnl pythondir -- where to install python scripts. This is the - dnl site-packages directory, not the python standard library - dnl directory like in previous automake betas. This behavior - dnl is more consistent with lispdir.m4 for example. - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. - AC_CACHE_CHECK([for $am_display_PYTHON script directory], - [am_cv_python_pythondir], - [if test "x$prefix" = xNONE - then - am_py_prefix=$ac_default_prefix - else - am_py_prefix=$prefix - fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` - am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` - ;; - *) - case $am_py_prefix in - /usr|/System*) ;; - *) - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac - ]) - AC_SUBST([pythondir], [$am_cv_python_pythondir]) - - dnl pkgpythondir -- $PACKAGE directory under pythondir. Was - dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is - dnl more consistent with the rest of automake. - - AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) - - dnl pyexecdir -- directory for installing python extension modules - dnl (shared libraries) - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. - AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], - [am_cv_python_pyexecdir], - [if test "x$exec_prefix" = xNONE - then - am_py_exec_prefix=$am_py_prefix - else - am_py_exec_prefix=$exec_prefix - fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` - am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` - ;; - *) - case $am_py_exec_prefix in - /usr|/System*) ;; - *) - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac - ]) - AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) - - dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) - - AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) - - dnl Run any user-specified action. - $2 - fi - -]) - - -# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -# --------------------------------------------------------------------------- -# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. -# Run ACTION-IF-FALSE otherwise. -# This test uses sys.hexversion instead of the string equivalent (first -# word of sys.version), in order to cope with versions such as 2.2c1. -# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). -AC_DEFUN([AM_PYTHON_CHECK_VERSION], - [prog="import sys -# split strings by '.' and convert to numeric. Append some zeros -# because we need at least 4 digits for the hex conversion. -# map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] -minverhex = 0 -# xrange is not present in Python 3.0 and range returns an iterator -for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] -sys.exit(sys.hexversion < minverhex)" - AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) - -# Copyright (C) 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. - -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 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. + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi -# serial 5 + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) -# 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 + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi -# 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 we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" - # 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 "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi - 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 test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + 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 and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) -# Copyright (C) 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. + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi -# serial 1 + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -# 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], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -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 -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) + # We need to process the po/ directory. + POSUB=po -# Copyright (C) 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. + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -# 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])]) + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -# Copyright (C) 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. + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -# serial 2 +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -# Check how to create a tarball. -*- Autoconf -*- + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) -# Copyright (C) 2004, 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. + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) -# serial 2 +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` +fi +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) -# _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. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} 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 +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl + +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) - # 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 +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) fi -done -rm -rf conftest.dir -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 + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) @@ -8485,48 +7787,181 @@ ;; 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 -]) + # 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 +]) + +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_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 + +_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_flag_spec_ld, $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 + +# Source file extension for f77 test sources. +ac_ext=f + +# 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 "$_lt_disable_F77" != yes; 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 +" + + # 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_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]) + + 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 + ;; + 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]) + + 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]) + + _LT_TAGVAR(GCC, $1)="$G77" + _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_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_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" +fi # test "$_lt_disable_F77" != yes -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 +AC_LANG_POP +])# _LT_LANG_F77_CONFIG -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are +# _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_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -8552,2033 +7987,2602 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -# Source file extension for f77 test sources. -ac_ext=f +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} -# Object file extension for compiled f77 test sources. +# 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 "$_lt_disable_FC" != yes; 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 +" + + # 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_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _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]) + + 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 + ;; + 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]) + + 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]) + + _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_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _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 + +# 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 {}" + +# 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 + +# 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_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _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 + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC 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 "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" +# 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 + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG - # 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 +# 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 +]) - # 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 name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - 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 - ;; - 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_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) - 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]) +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) - _LT_TAGVAR(GCC, $1)="$G77" - _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_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_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]) +]) - _LT_CONFIG($1) - fi # test -n "$compiler" - GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes +# _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]) +]) -AC_LANG_POP -])# _LT_LANG_F77_CONFIG +# _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_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 -# _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) +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. # -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi +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 -_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_flag_spec_ld, $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 +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext +# _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']) -# 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 -" +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']) - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" +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 - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER +# 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 - # 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_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) - _LT_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_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]) - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) - # 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_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; esac - AC_MSG_RESULT([$enable_shared]) + func_basename_result="${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]) + _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_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) - ## 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_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_CONFIG($1) - fi # test -n "$compiler" + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -AC_LANG_POP -])# _LT_LANG_FC_CONFIG + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# _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 +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -# Source file extension for Java test sources. -ac_ext=java + _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"]) -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext + # 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 -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# 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 -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' +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 -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER +# 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. -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE +# serial 7 ltoptions.m4 -# 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]) +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -# 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 +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) -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_CONFIG($1) -fi +# _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 +]) -AC_LANG_RESTORE -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG +# _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])]) -# _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 +# _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 +]) -# Source file extension for RC test sources. -ac_ext=rc -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext +# _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)]) -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +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 -# 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 +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) -# 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 -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi +# 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 -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) -# 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 +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.]) ]) -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes -# 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 $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_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]) +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 + +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 aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) -# _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]) -]) -# _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_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) -# _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 + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED -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_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) -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 +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +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($@)]) + dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) -# _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']) +# _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) -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 + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC -# 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 +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_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=: +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) ]) +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) -# _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_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) - _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_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) +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])]) - _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"}]) +# 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.]) +]) - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) +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.]) +]) - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi +# _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], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - _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"]) +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC - # 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 +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -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.]) ]) -# _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 +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) -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 -# Helper functions for option handling. -*- Autoconf -*- +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])]) + +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])]) + +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# Written by Gary V. Vaughan, 2004 +# 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. -# serial 7 ltoptions.m4 +# serial 6 ltsugar.m4 # This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) +# 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_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_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 -]) +# 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])]) + -# _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])]) +# 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_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 -]) +# 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])]) -# _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)]) +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) -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 +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) -# _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_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_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE +# 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])]) -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +# 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 ]) -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.]) +# 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. + +# @configure_input@ + +# serial 3293 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4]) +m4_define([LT_PACKAGE_REVISION], [1.3293]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4' +macro_revision='1.3293' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) +# 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 -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes +# 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. -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 +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl +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])]) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl +# 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. -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. -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.]) +AC_PREREQ([2.50]) + +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]) ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +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]) -# _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 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +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 - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) +fi[]dnl +])# PKG_PROG_PKG_CONFIG - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED +# 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]) -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) +# _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 -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) +# _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 -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($@)]) +# 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 -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +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.]) +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 -# _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) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC +$$1_PKG_ERRORS -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) +_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. + +_PKG_TEXT -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) +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 -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 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. -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) +# 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.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) +# _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.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# _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) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL +# Copyright (C) 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. -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])]) +# 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. -# 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_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` ]) -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_CONDITIONAL -*- Autoconf -*- -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# 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. +# serial 9 -# _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], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) +# 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='#' +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])]) -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 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. -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC +# serial 10 -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) +# 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... -# 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], []) +# _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. +# +# 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 +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=]) -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])]) +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'. + 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 -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])]) + 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]) -# 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. + 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 -# serial 6 ltsugar.m4 + # 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 + ;; + 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 -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + 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_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_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_car(LIST) -# lt_cdr(LIST) +# AM_DEP_TRACK # ------------ -# 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_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='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) +# Generate code to set up dependency tracking. -*- Autoconf -*- -# 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). +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # -# 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])]) - - - -# 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])])])])]) +# 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_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 -# lt_dict_add(DICT, KEY, VALUE) +# AM_OUTPUT_DEPENDENCY_COMMANDS # ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# 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 -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 +# This macro should only be invoked once -- use via AC_REQUIRE. # -# 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 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"]) +]) -# @configure_input@ +# Do all the work for Automake. -*- Autoconf -*- -# serial 3293 ltversion.m4 -# This file is part of GNU Libtool +# 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. -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +# serial 16 -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) +# 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~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. +# 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 -# serial 5 lt~obsolete.m4 +# 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]) -# 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. +# 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 -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -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])]) +# 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 +]) -# 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. +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])]) -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. -AC_PREREQ([2.50]) +# 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. -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]) -]) +# 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]) -# 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. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # -# 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. +# 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_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, 2005 Free Software Foundation, Inc. # -# 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 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. -# 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]) +# serial 2 -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +# 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 -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 +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# 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 + +# 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 am_maintainer_other 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 +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # -# 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]) +# 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. -# _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 +# serial 4 -# _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 +# 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 -*- -# 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 -# +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # -# -------------------------------------------------------------- -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 +# 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. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# serial 6 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# 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)]) -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.]) -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 +# 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 +]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# Copyright (C) 2003, 2004, 2005, 2006 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. -$$1_PKG_ERRORS +# 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 +]) -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# Helper functions for option handling. -*- Autoconf -*- -_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. +# Copyright (C) 2001, 2002, 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. -_PKG_TEXT +# serial 4 -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 +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 +# _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)])]) + +# _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) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 +# Free Software Foundation, Inc. # -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 +# 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_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------------- +# Adds support for distributing Python modules and packages. To +# install modules, copy them to $(pythondir), using the python_PYTHON +# automake variable. To install a package with the same name as the +# automake package, install to $(pkgpythondir), or use the +# pkgpython_PYTHON automake variable. # -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as +# locations to install python extension modules (shared libraries). +# Another macro is required to find the appropriate flags to compile +# extension modules. # -# Modified to require ngettext -# Matthias Clasen 08/06/2004 +# If your package is configured with a different prefix to python, +# users will have to add the install directory to the PYTHONPATH +# environment variable, or create a .pth file (see the python +# documentation for details). # -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break +# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will +# cause an error if the version of python installed on the system +# doesn't meet the requirement. MINIMUM-VERSION should consist of +# numbers and dots only. +AC_DEFUN([AM_PATH_PYTHON], + [ + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], + [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl +python2.1 python2.0]) + + m4_if([$1],[],[ + dnl No version check is needed. + # Find any Python interpreter. + if test -z "$PYTHON"; then + AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) + fi + am_display_PYTHON=python + ], [ + dnl A version check is needed. + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], + [AC_MSG_RESULT(yes)], + [AC_MSG_ERROR(too old)]) + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. + AC_CACHE_CHECK([for a Python interpreter with version >= $1], + [am_cv_pathless_PYTHON],[ + for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do + test "$am_cv_pathless_PYTHON" = none && break + AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) + done]) + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) fi + am_display_PYTHON=$am_cv_pathless_PYTHON fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) + ]) -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) + if test "$PYTHON" = :; then + dnl Run any user-specified action, or abort. + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) + else - gt_cv_have_gettext=no + dnl Query Python for its version number. Getting [:3] seems to be + dnl the best way to do this; it's what "site.py" does in the standard + dnl library. - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= + AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], + [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" + dnl Use the values of $prefix and $exec_prefix for the corresponding + dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made + dnl distinct variables so they can be overridden if need be. However, + dnl general consensus is that you shouldn't need this ability. - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi + AC_SUBST([PYTHON_PREFIX], ['${prefix}']) + AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) + dnl At times (like when building shared libraries) you may want + dnl to know which OS platform Python thinks this is. - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi + AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) + AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi + dnl Set up 4 directories: - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - 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 and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi + dnl pythondir -- where to install python scripts. This is the + dnl site-packages directory, not the python standard library + dnl directory like in previous automake betas. This behavior + dnl is more consistent with lispdir.m4 for example. + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON script directory], + [am_cv_python_pythondir], + [if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + + dnl pyexecdir -- directory for installing python extension modules + dnl (shared libraries) + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], + [am_cv_python_pyexecdir], + [if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) - # We need to process the po/ directory. - POSUB=po + dnl Run any user-specified action. + $2 + fi - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +]) - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------------------------------- +# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. +# Run ACTION-IF-FALSE otherwise. +# This test uses sys.hexversion instead of the string equivalent (first +# word of sys.version), in order to cope with versions such as 2.2c1. +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). +AC_DEFUN([AM_PYTHON_CHECK_VERSION], + [prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] +sys.exit(sys.hexversion < minverhex)" + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# AM_GLIB_GNU_GETTEXT +# Copyright (C) 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. + +# AM_RUN_LOG(COMMAND) # ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# 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); }]) - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +# Check to make sure that the build environment is sane. -*- Autoconf -*- - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +# 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. - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +# serial 5 + +# 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 - AC_SUBST(MKINSTALLDIRS) + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" + # 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 - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` + test "$[2]" = conftest.file + ) +then + # Ok. + : else - localedir=`eval echo "${datadir}/locale"` + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) +AC_MSG_RESULT(yes)]) -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl +# Copyright (C) 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. -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) +# serial 1 +# 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], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +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 +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl +# Copyright (C) 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. -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi +# 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])]) - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas +# Copyright (C) 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. -mostlyclean-am: clean-gsettings-schemas +# serial 2 -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas +# Check how to create a tarball. -*- Autoconf -*- -.SECONDARY: $(gsettings_SCHEMAS) +# Copyright (C) 2004, 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. -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi +# serial 2 -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +# _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. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} 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 -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + # 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 -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) + # 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 -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$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 diff -Nru eog-plugins-3.1.2/ChangeLog eog-plugins-3.2.2/ChangeLog --- eog-plugins-3.1.2/ChangeLog 2011-07-25 20:13:32.000000000 +0000 +++ eog-plugins-3.2.2/ChangeLog 2011-11-21 21:31:21.000000000 +0000 @@ -1,5 +1,246 @@ # Generated by Makefile. Do not edit. +commit 4e153fb07f30d7b351f3a5e04ca88673bd7aa4d2 +Author: Felix Riemann +Date: Mon Nov 21 22:30:52 2011 +0100 + + Prepare for release 3.2.2 + + NEWS | 17 +++++++++++++++++ + 1 files changed, 17 insertions(+), 0 deletions(-) + +commit 9bffafde76fc1930d5a5880c16f651f1a550d5e9 +Author: Mario Blättermann +Date: Fri Nov 18 18:06:13 2011 +0100 + + [l10n] Updated German translation + + po/de.po | 56 ++++++++++++++++++++++++++++++++++---------------------- + 1 files changed, 34 insertions(+), 22 deletions(-) + +commit 36e5c517c8a8483883e413cefd5ac845676b9ef5 +Author: Daniel Mustieles +Date: Mon Nov 14 10:50:51 2011 +0100 + + Updated Spanish translation + + po/es.po | 53 +++++++++++++++++++++++++++++++---------------------- + 1 files changed, 31 insertions(+), 22 deletions(-) + +commit 55ad8e0552992a5bd040ff264fcace1ba768591b +Author: Marek Černocký +Date: Thu Nov 10 16:23:41 2011 +0100 + + Updated Czech translation + + po/cs.po | 54 +++++++++++++++++++++++++++++++----------------------- + 1 files changed, 31 insertions(+), 23 deletions(-) + +commit 1c0d196a22e6da136777a13922b0d68f60889b14 +Author: Piotr Drąg +Date: Wed Nov 9 23:22:34 2011 +0100 + + Updated Polish translation + + po/pl.po | 22 +++++++++++++++++----- + 1 files changed, 17 insertions(+), 5 deletions(-) + +commit 7bc7d2a15cb2bc9085d5bd89521db223f333f824 +Author: Jiro Matsuzawa +Date: Sun Nov 6 19:15:59 2011 +0900 + + [postasa] Mark column titles as translatable + + https://bugzilla.gnome.org/show_bug.cgi?id=663494 + + plugins/postasa/postasa-uploads.xml | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 6d524a2833d90effbe7c2af0f3cf805f4bef4dc0 +Author: Sílvia Miranda +Date: Sun Oct 23 20:33:29 2011 +0200 + + [l10n]Updated Catalan translation + + po/ca.po | 129 ++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 68 insertions(+), 61 deletions(-) + +commit 0e05280d81e493c3d1d0c6178a4a23f1801a0dcf +Author: Felix Riemann +Date: Thu Oct 20 12:35:29 2011 +0200 + + Post-release version bump + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e98ddd186a184698bb48fc3b7684288b396515de +Author: Felix Riemann +Date: Thu Oct 20 12:33:43 2011 +0200 + + Prepare for release 3.2.1 + + NEWS | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +commit 41c86d7455dd1a3f8b1eb20cd4afec81427b8ead +Author: Daniel Nylander +Date: Mon Oct 17 10:56:54 2011 +0200 + + Updated Swedish translation + + po/sv.po | 110 ++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 58 insertions(+), 52 deletions(-) + +commit 19e2b5fc520e6a9afe587a0e1b30f8569e4be299 +Author: Rudolfs Mazurs +Date: Sun Oct 2 23:53:46 2011 +0300 + + Added Latvian translation. + + po/LINGUAS | 1 + + po/lv.po | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 259 insertions(+), 0 deletions(-) + +commit 540a03392e1a3189fa155296644838e19444d89b +Author: Felix Riemann +Date: Mon Sep 26 22:26:46 2011 +0200 + + Post-release version bump + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 322249a3bd125c031bb9d8dc77ec3c16692843d9 +Author: Felix Riemann +Date: Mon Sep 26 22:24:09 2011 +0200 + + Prepare for release 3.2.0 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletions(-) + +commit 553b1a24c423ee217a9c3f1b7f36cbf86774196d +Author: Changwoo Ryu +Date: Mon Sep 26 00:21:32 2011 +0900 + + Added Korean translation + + po/LINGUAS | 1 + + po/ko.po | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 261 insertions(+), 0 deletions(-) + +commit e63d148a23a8137460a44e79d3412b4680caa832 +Author: Felix Riemann +Date: Thu Sep 22 14:48:05 2011 +0200 + + Post-release version bump + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 04436715957029906676805a19a5637c4005cf92 +Author: Felix Riemann +Date: Thu Sep 22 14:45:25 2011 +0200 + + Prepare for release 3.1.3 + + NEWS | 19 +++++++++++++++++++ + 1 files changed, 19 insertions(+), 0 deletions(-) + +commit 61adc9abef67083ca43f06ea1d8a373364dfa89e +Author: Gianvito Cavasoli +Date: Wed Sep 21 19:53:02 2011 +0200 + + [l10n] Updated Italian translation + + po/it.po | 112 +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 57 insertions(+), 55 deletions(-) + +commit 448f56a64dafe729a31c130091969bf67d6b2c66 +Author: Gabor Kelemen +Date: Wed Sep 21 16:08:52 2011 +0200 + + Updated Hungarian translation by Balazs Ur + + po/hu.po | 112 ++++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 58 insertions(+), 54 deletions(-) + +commit bbab92eccdf0e983272d3da9c4de2eaf4829616a +Author: Yasumichi Akahoshi +Date: Wed Sep 21 20:59:35 2011 +0900 + + Updated Japanese translation + + po/ja.po | 55 ++++++++++++++++++++++++++++--------------------------- + 1 files changed, 28 insertions(+), 27 deletions(-) + +commit f9f80a655b1f706bc362693781e3eb6fc6d46a70 +Author: Claude Paroz +Date: Fri Sep 16 16:50:01 2011 +0200 + + Updated French translation + + po/fr.po | 111 ++++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 57 insertions(+), 54 deletions(-) + +commit afa73a4b0663888e8fa0dc50bd51d98540e5cf37 +Author: Claudio Saavedra +Date: Fri Sep 9 12:38:21 2011 +0300 + + Bump libchamplain dependency to 0.12 + + https://bugzilla.gnome.org/show_bug.cgi?id=658349 + + configure.ac | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit a0a30609c4abb333e49a80b0844e6b7483606592 +Author: Piotr Drąg +Date: Thu Sep 8 22:03:42 2011 +0200 + + Updated Polish translation + + po/pl.po | 106 ++++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 55 insertions(+), 51 deletions(-) + +commit d8cc2309768b85ae9ab530b7fc12f9fede0c2c04 +Author: Bruce Cowan +Date: Thu Sep 8 16:38:27 2011 +0100 + + Updated British English translation + + po/en_GB.po | 193 +++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 files changed, 155 insertions(+), 38 deletions(-) + +commit 3304012c84df25c7525d2a9646427b0451f39b37 +Author: António Lima +Date: Sun Sep 4 02:44:31 2011 +0100 + + Updated Portuguese translation + + po/pt.po | 115 ++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 60 insertions(+), 55 deletions(-) + +commit 69e36589ad62932758d49eb2fef7b731822cb950 +Author: Yuri Myasoedov +Date: Fri Jul 29 21:35:23 2011 +0400 + + Updated Russian translation + + po/ru.po | 57 ++++++++++++++++++++++++++++++++------------------------- + 1 files changed, 32 insertions(+), 25 deletions(-) + +commit 5dab707684879062988125e5fd232f16e38b7567 +Author: Felix Riemann +Date: Mon Jul 25 22:15:14 2011 +0200 + + Post-release version bump + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit fc36d38cea813a9431344fee786f40e9a897100e Author: Felix Riemann Date: Mon Jul 25 22:13:06 2011 +0200 diff -Nru eog-plugins-3.1.2/configure eog-plugins-3.2.2/configure --- eog-plugins-3.1.2/configure 2011-07-23 08:24:19.000000000 +0000 +++ eog-plugins-3.2.2/configure 2011-10-20 10:37:43.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for eog-plugins 3.1.2. +# Generated by GNU Autoconf 2.68 for eog-plugins 3.2.2. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='eog-plugins' PACKAGE_TARNAME='eog-plugins' -PACKAGE_VERSION='3.1.2' -PACKAGE_STRING='eog-plugins 3.1.2' +PACKAGE_VERSION='3.2.2' +PACKAGE_STRING='eog-plugins 3.2.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins' PACKAGE_URL='' @@ -1386,7 +1386,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures eog-plugins 3.1.2 to adapt to many kinds of systems. +\`configure' configures eog-plugins 3.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1456,7 +1456,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of eog-plugins 3.1.2:";; + short | recursive ) echo "Configuration of eog-plugins 3.2.2:";; esac cat <<\_ACEOF @@ -1588,7 +1588,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -eog-plugins configure 3.1.2 +eog-plugins configure 3.2.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1957,7 +1957,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by eog-plugins $as_me 3.1.2, which was +It was created by eog-plugins $as_me 3.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2871,7 +2871,7 @@ # Define the identity of the package. PACKAGE='eog-plugins' - VERSION='3.1.2' + VERSION='3.2.2' cat >>confdefs.h <<_ACEOF @@ -12814,6 +12814,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -14573,19 +14577,19 @@ pkg_cv_CHAMPLAIN_CFLAGS="$CHAMPLAIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 \""; } >&5 - ($PKG_CONFIG --exists --print-errors " champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + ($PKG_CONFIG --exists --print-errors " champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -14599,19 +14603,19 @@ pkg_cv_CHAMPLAIN_LIBS="$CHAMPLAIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 \""; } >&5 - ($PKG_CONFIG --exists --print-errors " champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + ($PKG_CONFIG --exists --print-errors " champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs " champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs " champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -14634,13 +14638,13 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 " 2>&1` else - CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 " 2>&1` fi @@ -15370,7 +15374,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by eog-plugins $as_me 3.1.2, which was +This file was extended by eog-plugins $as_me 3.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15436,7 +15440,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -eog-plugins config.status 3.1.2 +eog-plugins config.status 3.2.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru eog-plugins-3.1.2/configure.ac eog-plugins-3.2.2/configure.ac --- eog-plugins-3.1.2/configure.ac 2011-07-12 16:31:06.000000000 +0000 +++ eog-plugins-3.2.2/configure.ac 2011-10-20 10:35:23.000000000 +0000 @@ -3,7 +3,7 @@ EOG_MAJOR=3.0.0 EOG_PLUGINS_MAJOR=3.0.0 -AC_INIT([eog-plugins], [3.1.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins]) +AC_INIT([eog-plugins], [3.2.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=eog&component=plugins]) AC_CONFIG_SRCDIR([plugins]) AC_PREFIX_PROGRAM([eog]) @@ -262,8 +262,8 @@ then PKG_CHECK_MODULES(CHAMPLAIN, - [ champlain-0.10 >= 0.9.0, - champlain-gtk-0.10 >= 0.9.0, + [ champlain-0.12 >= 0.9.0, + champlain-gtk-0.12 >= 0.9.0, clutter-gtk-1.0 >= 0.90, libexif >= 0.6.16 ], [],[have_libchamplain=no]) diff -Nru eog-plugins-3.1.2/debian/changelog eog-plugins-3.2.2/debian/changelog --- eog-plugins-3.1.2/debian/changelog 2011-11-08 16:18:26.000000000 +0000 +++ eog-plugins-3.2.2/debian/changelog 2011-12-26 02:16:09.000000000 +0000 @@ -1,3 +1,31 @@ +eog-plugins (3.2.2-1ubuntu1) precise; urgency=low + + * Sync from Debian testing. + * fix LP: #697406 - eog should recommend you install its plugins; Add + Enhances: eog to eog-plugins so it shows up in software center as related + to eog + - update debian/control{,.in} + * Change Vcs-* to XS-Debian-Vcs-* + - update debian/control{,.in} + + -- Micah Gersten Sun, 25 Dec 2011 20:04:41 -0600 + +eog-plugins (3.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl Tue, 22 Nov 2011 02:23:41 +0100 + +eog-plugins (3.2.1-1) unstable; urgency=low + + [ Jeremy Bicha ] + * New upstream release. + * debian/control.in: Updated Vcs-* URLs + * debian/patches/01_libchamplain_0.12.patch: Dropped, applied upstream + * debian/watch: Switch to .xz tarballs + + -- Michael Biebl Thu, 17 Nov 2011 22:26:26 +0100 + eog-plugins (3.1.2-0ubuntu3) precise; urgency=low * Merge packaging changes from Debian 3.0.0-2 and 3.0.0-3. diff -Nru eog-plugins-3.1.2/debian/control eog-plugins-3.2.2/debian/control --- eog-plugins-3.1.2/debian/control 2011-11-08 16:18:30.000000000 +0000 +++ eog-plugins-3.2.2/debian/control 2011-12-26 02:16:15.000000000 +0000 @@ -20,9 +20,9 @@ libclutter-gtk-1.0-dev (>= 0.90), libexif-dev (>= 0.6.16) Standards-Version: 3.9.2 -Homepage: http://live.gnome.org/EyeOfGnome/Plugins -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/eog-plugins -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/eog-plugins +Homepage: https://live.gnome.org/EyeOfGnome/Plugins +XS-Debian-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/eog-plugins +XS-Debian-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/eog-plugins/ X-Python-Version: >= 2.3 Package: eog-plugins @@ -33,17 +33,18 @@ eog (>= 3.0), python-gobject (>= 2.27), gir1.2-gtk-3.0 +Enhances: eog Suggests: postr Description: set of plugins for eog eog-plugins contain a set of plugins for eog, Eye of GNOME. . The following plugins are included: - * Map: Display the geolocation of the image on a map - * Python Console: Python console for Eye of GNOME - * Send By Mail: Sends an image attached to a new mail - * Flickr Uploader: Upload your pictures to Flickr - * Zoom to fit image width: Zoom to fit image width * PicasaWeb Uploader: Upload your pictures to PicasaWeb - * Slideshow Shuffle: Shuffles images in slideshow mode + * Zoom to fit image width: Zoom to fit image width + * Send By Mail: Sends an image attached to a new mail * Exif display: Displays camera settings and histogram + * Slideshow Shuffle: Shuffles images in slideshow mode + * Flickr Uploader: Upload your pictures to Flickr + * Map: Display the geolocation of the image on a map + * Python Console: Python console for Eye of GNOME diff -Nru eog-plugins-3.1.2/debian/control.in eog-plugins-3.2.2/debian/control.in --- eog-plugins-3.1.2/debian/control.in 2011-11-07 12:45:04.000000000 +0000 +++ eog-plugins-3.2.2/debian/control.in 2011-12-26 02:06:11.000000000 +0000 @@ -20,9 +20,9 @@ libclutter-gtk-1.0-dev (>= 0.90), libexif-dev (>= 0.6.16) Standards-Version: 3.9.2 -Homepage: http://live.gnome.org/EyeOfGnome/Plugins -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/eog-plugins -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/eog-plugins +Homepage: https://live.gnome.org/EyeOfGnome/Plugins +XS-Debian-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/eog-plugins +XS-Debian-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/eog-plugins/ X-Python-Version: >= 2.3 Package: eog-plugins @@ -33,6 +33,7 @@ eog (>= 3.0), python-gobject (>= 2.27), gir1.2-gtk-3.0 +Enhances: eog Suggests: postr Description: set of plugins for eog eog-plugins contain a set of plugins for eog, Eye of GNOME. diff -Nru eog-plugins-3.1.2/debian/patches/01_libchamplain_0.12.patch eog-plugins-3.2.2/debian/patches/01_libchamplain_0.12.patch --- eog-plugins-3.1.2/debian/patches/01_libchamplain_0.12.patch 2011-11-07 12:47:46.000000000 +0000 +++ eog-plugins-3.2.2/debian/patches/01_libchamplain_0.12.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -262,8 +262,8 @@ - then - - PKG_CHECK_MODULES(CHAMPLAIN, -- [ champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ [ champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 ], - [],[have_libchamplain=no]) ---- a/configure -+++ b/configure -@@ -14573,19 +14573,19 @@ - pkg_cv_CHAMPLAIN_CFLAGS="$CHAMPLAIN_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 \""; } >&5 -- ($PKG_CONFIG --exists --print-errors " champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ ($PKG_CONFIG --exists --print-errors " champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -@@ -14599,19 +14599,19 @@ - pkg_cv_CHAMPLAIN_LIBS="$CHAMPLAIN_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 \""; } >&5 -- ($PKG_CONFIG --exists --print-errors " champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ ($PKG_CONFIG --exists --print-errors " champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs " champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs " champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -@@ -14634,13 +14634,13 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 " 2>&1` - else -- CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " champlain-0.10 >= 0.9.0, -- champlain-gtk-0.10 >= 0.9.0, -+ CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " champlain-0.12, -+ champlain-gtk-0.12, - clutter-gtk-1.0 >= 0.90, - libexif >= 0.6.16 " 2>&1` - fi diff -Nru eog-plugins-3.1.2/debian/patches/series eog-plugins-3.2.2/debian/patches/series --- eog-plugins-3.1.2/debian/patches/series 2011-11-07 12:43:45.000000000 +0000 +++ eog-plugins-3.2.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -01_libchamplain_0.12.patch diff -Nru eog-plugins-3.1.2/debian/watch eog-plugins-3.2.2/debian/watch --- eog-plugins-3.1.2/debian/watch 2011-08-02 16:19:29.000000000 +0000 +++ eog-plugins-3.2.2/debian/watch 2011-12-02 05:17:44.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/gnome/sources/eog-plugins/([\d\.]+)[02468]/eog-plugins-([\d\.]+)\.tar\.bz2 +http://ftp.gnome.org/pub/gnome/sources/eog-plugins/([\d\.]+[02468])/eog-plugins-(.*)\.tar\.xz diff -Nru eog-plugins-3.1.2/INSTALL eog-plugins-3.2.2/INSTALL --- eog-plugins-3.1.2/INSTALL 1970-01-01 00:00:00.000000000 +0000 +++ eog-plugins-3.2.2/INSTALL 2009-09-08 10:48:04.000000000 +0000 @@ -0,0 +1,302 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./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. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff -Nru eog-plugins-3.1.2/Makefile.in eog-plugins-3.2.2/Makefile.in --- eog-plugins-3.1.2/Makefile.in 2011-07-23 08:24:20.000000000 +0000 +++ eog-plugins-3.2.2/Makefile.in 2011-10-20 10:37:43.000000000 +0000 @@ -36,9 +36,9 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING NEWS config.guess \ - config.sub depcomp install-sh ltmain.sh missing mkinstalldirs \ - py-compile + $(top_srcdir)/configure AUTHORS COPYING INSTALL NEWS \ + config.guess config.sub depcomp install-sh ltmain.sh missing \ + mkinstalldirs py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff -Nru eog-plugins-3.1.2/NEWS eog-plugins-3.2.2/NEWS --- eog-plugins-3.1.2/NEWS 2011-07-25 20:12:09.000000000 +0000 +++ eog-plugins-3.2.2/NEWS 2011-11-21 21:30:39.000000000 +0000 @@ -1,3 +1,54 @@ +Version 3.2.2 +------------- + +Plugin changes: + +- PicasaWeb Uploader + - #663494, The column titles in the postasa-uploads-view are + not translatable. (Jiro Matsuzawa) + +New and updated translations: + +- Sílvia Miranda [ca] +- Marek Černocký [cs] +- Mario Blättermann [de] +- Daniel Mustieles [es] +- Piotr Drąg [pl] + +Version 3.2.1 +------------- + +New and updated translations: + +- Rūdofls Mazurs [lv] +- Daniel Nylander [sv] + +Version 3.2.0 +------------- + +New and updated translations: + +- Changwoo Ryu [ko] + +Version 3.1.3 +------------- + +Plugin changes: + +- Map + - #658349, Support libchamplain 0.11/0.12 (Claudio Saavedra) + +New and updated translations: + +- Bruce Cowan [en_GB] +- Claude Paroz [fr] +- Balazs Ur [hu] +- Gianvito Cavasoli [it] +- Yasumichi Akahoshi [ja] +- Piotr Drąg [pl] +- António Lima [pt] +- Yuri Myasoedov [ru] + Version 3.1.2 ------------- diff -Nru eog-plugins-3.1.2/plugins/postasa/postasa-uploads.xml eog-plugins-3.2.2/plugins/postasa/postasa-uploads.xml --- eog-plugins-3.1.2/plugins/postasa/postasa-uploads.xml 2011-07-11 21:07:16.000000000 +0000 +++ eog-plugins-3.2.2/plugins/postasa/postasa-uploads.xml 2011-11-09 22:07:09.000000000 +0000 @@ -59,7 +59,7 @@ uploads_store - File + File True @@ -81,7 +81,7 @@ fixed 60 - Size + Size @@ -93,7 +93,7 @@ 160 - Status + Status diff -Nru eog-plugins-3.1.2/po/ca.po eog-plugins-3.2.2/po/ca.po --- eog-plugins-3.1.2/po/ca.po 2011-01-16 19:42:45.000000000 +0000 +++ eog-plugins-3.2.2/po/ca.po 2011-11-09 22:07:09.000000000 +0000 @@ -2,37 +2,41 @@ # Copyright (C) 2007, 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the eog-plugins package. # Gil Forcada , 2007. -# Marc Dabad , 2010. +# Marc Dabad , 2010. +# Sílvia Miranda , 2011. +# msgid "" msgstr "" "Project-Id-Version: eog-plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-07 20:21+0200\n" -"PO-Revision-Date: 2010-03-18 23:07+0100\n" -"Last-Translator: Marc Dabad \n" +"POT-Creation-Date: 2011-10-23 20:31+0200\n" +"PO-Revision-Date: 2011-10-23 17:37+0200\n" +"Last-Translator: Sílvia Miranda \n" "Language-Team: Catalan \n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../plugins/exif-display/eog-exif-display-plugin.c:136 +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" -msgstr "(Unicode no vàlid)" +msgstr " (Unicode no vàlid)" #. TRANSLATORS: This is the actual focal length used when #. the image was taken. -#: ../plugins/exif-display/eog-exif-display-plugin.c:212 +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" -msgstr "%.1fmm (lent)" +msgstr "%.1f mm (lent)" #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming #. a 35mm film camera. -#: ../plugins/exif-display/eog-exif-display-plugin.c:223 +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 #, c-format msgid "%.1fmm (35mm film)" -msgstr "%.1fmm (film de 35mm)" +msgstr "%.1f mm (pel·lícula de 35 mm)" #: ../plugins/exif-display/exif-display-config.ui.h:1 msgid "General" @@ -54,11 +58,11 @@ msgid "Display per-channel histogram" msgstr "Visualitza l'histograma per canal" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:1 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 msgid "Displays camera settings and histogram" msgstr "Visualitza els paràmetres de la càmera i l'histograma" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:2 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 msgid "Exif display" msgstr "Visualitza l'EXIF" @@ -90,103 +94,106 @@ msgid "Zoom:" msgstr "Ampliació:" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:85 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 msgid "Fit to width" msgstr "Ajusta a l'amplada" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:87 -#: ../plugins/fit-to-width/fit-to-width.eog-plugin.desktop.in.h:1 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 msgid "Zoom to fit image width" msgstr "Amplia per ajustar-se a l'amplada de la imatge" -#: ../plugins/map/eog-map-plugin.c:321 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Salta a la ubicació de la imatge actual" -#: ../plugins/map/eog-map-plugin.c:333 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Amplia" -#: ../plugins/map/eog-map-plugin.c:341 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Redueix" -#: ../plugins/map/eog-map-plugin.c:355 -#: ../plugins/map/map.eog-plugin.desktop.in.h:2 +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Mapa" -#: ../plugins/map/map.eog-plugin.desktop.in.h:1 +#: ../plugins/map/map.plugin.desktop.in.h:1 msgid "Display the geolocation of the image on a map" -msgstr "Visualitza la posició de la imatge en el mapa" +msgstr "Visualitza la localització geogràfica de la imatge en un mapa" -#: ../plugins/postasa/eog-postasa-plugin.c:124 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" -msgstr "Puja al PicasaWeb" +msgstr "Puja al Picasa Web" -#: ../plugins/postasa/eog-postasa-plugin.c:126 -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:2 +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" -msgstr "Puja les imatges al PicasaWeb" +msgstr "Puja les imatges al Picasa Web" -#: ../plugins/postasa/eog-postasa-plugin.c:320 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "S'està pujant..." -#: ../plugins/postasa/eog-postasa-plugin.c:366 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Pujat" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Cancel·lat" -#: ../plugins/postasa/eog-postasa-plugin.c:373 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Ha fallat" -#: ../plugins/postasa/eog-postasa-plugin.c:520 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "No s'ha pogut entrar. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:524 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "S'ha entrat correctament." -#: ../plugins/postasa/eog-postasa-plugin.c:525 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Tanca" -#: ../plugins/postasa/eog-postasa-plugin.c:546 -#: ../plugins/postasa/postasa-config.xml.h:1 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Cancel·la" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:552 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "S'està entrant..." -#: ../plugins/postasa/eog-postasa-plugin.c:580 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." -msgstr "Entreu per continuar pujant." +msgstr "Entreu per continuar el procés de pujada." + +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "Entra al Picasa Web" #: ../plugins/postasa/postasa-config.xml.h:2 -msgid "Login" -msgstr "Entra" +msgid "_Cancel" +msgstr "_Cancel·la" #: ../plugins/postasa/postasa-config.xml.h:3 -msgid "Password" -msgstr "Contrasenya" +msgid "_Login" +msgstr "_Entra" #: ../plugins/postasa/postasa-config.xml.h:4 -msgid "PicasaWeb Login" -msgstr "Usuari del Picassa Web" +msgid "_Password:" +msgstr "_Contrasenya:" #: ../plugins/postasa/postasa-config.xml.h:5 -msgid "Username" -msgstr "Nom d'usuari" +msgid "_Username:" +msgstr "_Nom d'usuari:" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -200,52 +207,52 @@ msgid "Uploads:" msgstr "Pujades:" -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:1 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" -msgstr "Gestor de pujades al PicasaWeb" +msgstr "Gestor de pujades al Picasa Web" -#: ../plugins/postr/eog-postr-plugin.c:57 +#: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" msgstr "Puja al Flickr" -#: ../plugins/postr/eog-postr-plugin.c:59 -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:2 +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 msgid "Upload your pictures to Flickr" msgstr "Puja les fotos al Flickr" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:1 +#: ../plugins/postr/postr.plugin.desktop.in.h:1 msgid "Flickr Uploader" msgstr "Gestor de pujades al Flickr" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:1 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" msgstr "Consola de Python" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:2 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 msgid "Python console for Eye of GNOME" msgstr "Consola de Python per a l'Eye of GNOME" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:60 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 msgid "Send by Mail" msgstr "Envia per correu electrònic" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:62 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 msgid "Send the selected images by mail" msgstr "Envia les imatges seleccionades per correu electrònic" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:1 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 msgid "Send By Mail" msgstr "Envia per correu electrònic" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:2 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 msgid "Sends an image attached to a new mail" msgstr "Envia un correu electrònic nou amb una imatge adjuntada" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:1 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 msgid "Shuffles images in slideshow mode" msgstr "Mescla les imatges en el mode de presentació amb diapositives" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:2 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 msgid "Slideshow Shuffle" msgstr "Presentació amb diapositives mesclades" diff -Nru eog-plugins-3.1.2/po/cs.po eog-plugins-3.2.2/po/cs.po --- eog-plugins-3.1.2/po/cs.po 2011-07-16 08:16:22.000000000 +0000 +++ eog-plugins-3.2.2/po/cs.po 2011-11-21 21:27:28.000000000 +0000 @@ -12,14 +12,14 @@ "Project-Id-Version: eog-plugins\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=eog-" "plugins&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-07-11 20:36+0000\n" -"PO-Revision-Date: 2011-07-14 14:48+0200\n" +"POT-Creation-Date: 2011-11-09 22:06+0000\n" +"PO-Revision-Date: 2011-11-10 16:22+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" -"Language: cs\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" #: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" @@ -105,19 +105,19 @@ msgid "Zoom to fit image width" msgstr "Přizpůsobí měřítko obrázku šířce obrazovky" -#: ../plugins/map/eog-map-plugin.c:363 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Přejít na místo pořízení aktuálního obrázku" -#: ../plugins/map/eog-map-plugin.c:375 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Přiblížit" -#: ../plugins/map/eog-map-plugin.c:383 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Oddálit" -#: ../plugins/map/eog-map-plugin.c:397 +#: ../plugins/map/eog-map-plugin.c:430 #: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Mapa" @@ -126,54 +126,54 @@ msgid "Display the geolocation of the image on a map" msgstr "Zobrazí geografickou polohu obrázku na mapě" -#: ../plugins/postasa/eog-postasa-plugin.c:127 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" msgstr "Odeslat na Picasa" -#: ../plugins/postasa/eog-postasa-plugin.c:129 +#: ../plugins/postasa/eog-postasa-plugin.c:128 #: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Odešlete své obrázky na Picasa" -#: ../plugins/postasa/eog-postasa-plugin.c:324 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "Odesílá se…" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Odesláno" -#: ../plugins/postasa/eog-postasa-plugin.c:374 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Zrušeno" -#: ../plugins/postasa/eog-postasa-plugin.c:377 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Selhalo" -#: ../plugins/postasa/eog-postasa-plugin.c:600 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "Přihlášení selhalo. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:604 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "Přihlášení úspěšné" -#: ../plugins/postasa/eog-postasa-plugin.c:605 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Zavřít" -#: ../plugins/postasa/eog-postasa-plugin.c:626 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Zrušit" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:632 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "Přihlašuje se…" -#: ../plugins/postasa/eog-postasa-plugin.c:677 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "Prosím přihlašte se pro pokračování odesílání." @@ -182,22 +182,18 @@ msgstr "Přihlášení na Picasa" #: ../plugins/postasa/postasa-config.xml.h:2 -#| msgid "Cancel" msgid "_Cancel" msgstr "_Zrušit" #: ../plugins/postasa/postasa-config.xml.h:3 -#| msgid "Login" msgid "_Login" msgstr "Přih_lásit se" #: ../plugins/postasa/postasa-config.xml.h:4 -#| msgid "Password" msgid "_Password:" msgstr "_Heslo:" #: ../plugins/postasa/postasa-config.xml.h:5 -#| msgid "Username" msgid "_Username:" msgstr "_Uživatelské jméno:" @@ -210,6 +206,18 @@ msgstr "Zvoleno zrušení" #: ../plugins/postasa/postasa-uploads.xml.h:3 +msgid "File" +msgstr "Soubor" + +#: ../plugins/postasa/postasa-uploads.xml.h:4 +msgid "Size" +msgstr "Velikost" + +#: ../plugins/postasa/postasa-uploads.xml.h:5 +msgid "Status" +msgstr "Stav" + +#: ../plugins/postasa/postasa-uploads.xml.h:6 msgid "Uploads:" msgstr "Odesílání:" diff -Nru eog-plugins-3.1.2/po/de.po eog-plugins-3.2.2/po/de.po --- eog-plugins-3.1.2/po/de.po 2011-07-16 08:16:22.000000000 +0000 +++ eog-plugins-3.2.2/po/de.po 2011-11-21 21:27:28.000000000 +0000 @@ -1,5 +1,5 @@ # German translation of eog-plugins. -# Mario Blättermann , 2008-2011. +# Mario Blättermann , 2008-2011. # Felix Riemann , 2009. # msgid "" @@ -7,9 +7,9 @@ "Project-Id-Version: eog-plugins\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=eog-" "plugins&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-07-11 20:36+0000\n" -"PO-Revision-Date: 2011-07-11 20:51+0000\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2011-11-09 22:06+0000\n" +"PO-Revision-Date: 2011-11-18 18:03+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +26,7 @@ #: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" -msgstr "%.1f (Linse)" +msgstr "%.1f (Objektiv)" #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming @@ -82,7 +82,7 @@ #: ../plugins/exif-display/exif-display.ui.h:5 msgid "ISO speed:" -msgstr "ISO-Emfindlichkeit:" +msgstr "ISO-Empfindlichkeit:" #: ../plugins/exif-display/exif-display.ui.h:6 msgid "Metering:" @@ -102,19 +102,19 @@ msgid "Zoom to fit image width" msgstr "Vergrößerung auf Bildbreite anpassen" -#: ../plugins/map/eog-map-plugin.c:363 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Zum Ort des aktuellen Bildes springen" -#: ../plugins/map/eog-map-plugin.c:375 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Vergrößern" -#: ../plugins/map/eog-map-plugin.c:383 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Verkleinern" -#: ../plugins/map/eog-map-plugin.c:397 ../plugins/map/map.plugin.desktop.in.h:2 +#: ../plugins/map/eog-map-plugin.c:430 ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Karte" @@ -122,54 +122,54 @@ msgid "Display the geolocation of the image on a map" msgstr "Die Geoposition eines Bildes in einer Karte anzeigen" -#: ../plugins/postasa/eog-postasa-plugin.c:127 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" msgstr "Hochladen zu PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:129 +#: ../plugins/postasa/eog-postasa-plugin.c:128 #: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Hochladen Ihrer Bilder zum PicasaWeb-Bilderdienst" -#: ../plugins/postasa/eog-postasa-plugin.c:324 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "Übertragung läuft …" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Hochgeladen" -#: ../plugins/postasa/eog-postasa-plugin.c:374 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Abgebrochen" -#: ../plugins/postasa/eog-postasa-plugin.c:377 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Fehlgeschlagen" -#: ../plugins/postasa/eog-postasa-plugin.c:600 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "Anmeldung fehlgeschlagen. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:604 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "Erfolgreich angemeldet." -#: ../plugins/postasa/eog-postasa-plugin.c:605 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Schließen" -#: ../plugins/postasa/eog-postasa-plugin.c:626 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Abbrechen" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:632 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "Anmeldung läuft …" -#: ../plugins/postasa/eog-postasa-plugin.c:677 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "Bitte melden Sie sich an, um die Übertragung fortzusetzen." @@ -202,6 +202,18 @@ msgstr "Ausgewählte abbrechen" #: ../plugins/postasa/postasa-uploads.xml.h:3 +msgid "File" +msgstr "Datei" + +#: ../plugins/postasa/postasa-uploads.xml.h:4 +msgid "Size" +msgstr "Größe" + +#: ../plugins/postasa/postasa-uploads.xml.h:5 +msgid "Status" +msgstr "Status" + +#: ../plugins/postasa/postasa-uploads.xml.h:6 msgid "Uploads:" msgstr "Übertragungen:" diff -Nru eog-plugins-3.1.2/po/en_GB.po eog-plugins-3.2.2/po/en_GB.po --- eog-plugins-3.1.2/po/en_GB.po 2011-01-16 19:42:45.000000000 +0000 +++ eog-plugins-3.2.2/po/en_GB.po 2011-09-21 15:57:49.000000000 +0000 @@ -3,36 +3,29 @@ # This file is distributed under the same license as the eog-plugins package. # Philip Withnall , 2008–2009. # Jen Ockwell , 2009. -# -# +# Bruce Cowan , 2011. msgid "" msgstr "" "Project-Id-Version: eog-plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-13 15:56+0100\n" -"PO-Revision-Date: 2009-03-22 17:17+0000\n" -"Last-Translator: Philip Withnall \n" +"POT-Creation-Date: 2011-09-08 16:36+0100\n" +"PO-Revision-Date: 2011-09-08 16:37+0100\n" +"Last-Translator: Bruce Cowan \n" "Language-Team: British English \n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1-beta1\n" -#: ../plugins/champlain/champlain.eog-plugin.desktop.in.h:1 -msgid "Display the geolocation of the image on a map" -msgstr "Display the geolocation of the image on a map" - -#: ../plugins/champlain/champlain.eog-plugin.desktop.in.h:2 -#: ../plugins/champlain/eog-champlain-plugin.c:312 -msgid "Map" -msgstr "Map" - -#: ../plugins/exif-display/eog-exif-display-plugin.c:136 +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" msgstr " (invalid Unicode)" #. TRANSLATORS: This is the actual focal length used when #. the image was taken. -#: ../plugins/exif-display/eog-exif-display-plugin.c:212 +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" msgstr "%.1fmm (lens)" @@ -40,7 +33,7 @@ #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming #. a 35mm film camera. -#: ../plugins/exif-display/eog-exif-display-plugin.c:223 +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 #, c-format msgid "%.1fmm (35mm film)" msgstr "%.1fmm (35mm film)" @@ -65,11 +58,11 @@ msgid "Display per-channel histogram" msgstr "Display per-channel histogram" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:1 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 msgid "Displays camera settings and histogram" msgstr "Displays camera settings and histogram" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:2 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 msgid "Exif display" msgstr "Exif display" @@ -101,44 +94,168 @@ msgid "Zoom:" msgstr "Zoom:" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:82 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 msgid "Fit to width" msgstr "Fit to width" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:84 -#: ../plugins/fit-to-width/fit-to-width.eog-plugin.desktop.in.h:1 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 msgid "Zoom to fit image width" msgstr "Zoom to fit image width" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:1 -msgid "Shuffles images in slideshow mode" -msgstr "Shuffles images in slideshow mode" +#: ../plugins/map/eog-map-plugin.c:396 +msgid "Jump to current image's location" +msgstr "Jump to current image's location" + +#: ../plugins/map/eog-map-plugin.c:408 +msgid "Zoom in" +msgstr "Zoom in" + +#: ../plugins/map/eog-map-plugin.c:416 +msgid "Zoom out" +msgstr "Zoom out" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:2 -msgid "Slideshow Shuffle" -msgstr "Slideshow Shuffle" +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 +msgid "Map" +msgstr "Map" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:1 -msgid "Flickr Uploader" -msgstr "Flickr Uploader" +#: ../plugins/map/map.plugin.desktop.in.h:1 +msgid "Display the geolocation of the image on a map" +msgstr "Display the geolocation of the image on a map" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:2 -#: ../plugins/postr/eog-postr-plugin.c:59 -msgid "Upload your pictures to Flickr" -msgstr "Upload your pictures to Flickr" +#: ../plugins/postasa/eog-postasa-plugin.c:126 +msgid "Upload to PicasaWeb" +msgstr "Upload to PicasaWeb" + +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 +msgid "Upload your pictures to PicasaWeb" +msgstr "Upload your pictures to PicasaWeb" + +#: ../plugins/postasa/eog-postasa-plugin.c:323 +msgid "Uploading..." +msgstr "Uploading…" + +#: ../plugins/postasa/eog-postasa-plugin.c:369 +msgid "Uploaded" +msgstr "Uploaded" + +#: ../plugins/postasa/eog-postasa-plugin.c:373 +msgid "Cancelled" +msgstr "Cancelled" + +#: ../plugins/postasa/eog-postasa-plugin.c:376 +msgid "Failed" +msgstr "Failed" + +#: ../plugins/postasa/eog-postasa-plugin.c:599 +#, c-format +msgid "Login failed. %s" +msgstr "Login failed. %s" -#: ../plugins/postr/eog-postr-plugin.c:57 +#: ../plugins/postasa/eog-postasa-plugin.c:603 +msgid "Logged in successully." +msgstr "Logged in successfully." + +#: ../plugins/postasa/eog-postasa-plugin.c:604 +msgid "Close" +msgstr "Close" + +#: ../plugins/postasa/eog-postasa-plugin.c:625 +msgid "Cancel" +msgstr "Cancel" + +#. TODO: want to handle passwords more securely +#: ../plugins/postasa/eog-postasa-plugin.c:631 +msgid "Logging in..." +msgstr "Logging in…" + +#: ../plugins/postasa/eog-postasa-plugin.c:676 +msgid "Please log in to continue upload." +msgstr "Please log in to continue upload." + +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "PicasaWeb Login" + +#: ../plugins/postasa/postasa-config.xml.h:2 +msgid "_Cancel" +msgstr "_Cancel" + +#: ../plugins/postasa/postasa-config.xml.h:3 +msgid "_Login" +msgstr "_Login" + +#: ../plugins/postasa/postasa-config.xml.h:4 +msgid "_Password:" +msgstr "_Password:" + +#: ../plugins/postasa/postasa-config.xml.h:5 +msgid "_Username:" +msgstr "_Username:" + +#: ../plugins/postasa/postasa-uploads.xml.h:1 +msgid "Cancel All" +msgstr "Cancel All" + +#: ../plugins/postasa/postasa-uploads.xml.h:2 +msgid "Cancel Selected" +msgstr "Cancel Selected" + +#: ../plugins/postasa/postasa-uploads.xml.h:3 +msgid "Uploads:" +msgstr "Uploads:" + +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 +msgid "PicasaWeb Uploader" +msgstr "PicasaWeb Uploader" + +#: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" msgstr "Upload to Flickr" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:1 +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 +msgid "Upload your pictures to Flickr" +msgstr "Upload your pictures to Flickr" + +#: ../plugins/postr/postr.plugin.desktop.in.h:1 +msgid "Flickr Uploader" +msgstr "Flickr Uploader" + +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" msgstr "Python Console" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:2 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 msgid "Python console for Eye of GNOME" msgstr "Python console for Eye of GNOME" +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 +msgid "Send by Mail" +msgstr "Send by Mail" + +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 +msgid "Send the selected images by mail" +msgstr "Send the selected images by mail" + +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 +msgid "Send By Mail" +msgstr "Send By Mail" + +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 +msgid "Sends an image attached to a new mail" +msgstr "Sends an image attached to a new mail" + +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 +msgid "Shuffles images in slideshow mode" +msgstr "Shuffles images in slideshow mode" + +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 +msgid "Slideshow Shuffle" +msgstr "Slideshow Shuffle" + #~ msgid "Reload Image" #~ msgstr "Reload Image" diff -Nru eog-plugins-3.1.2/po/es.po eog-plugins-3.2.2/po/es.po --- eog-plugins-3.1.2/po/es.po 2011-07-16 08:16:22.000000000 +0000 +++ eog-plugins-3.2.2/po/es.po 2011-11-21 21:27:28.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: eog-plugins.HEAD.es\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=eog-" "plugins&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-07-11 20:36+0000\n" -"PO-Revision-Date: 2011-07-13 10:51+0200\n" +"POT-Creation-Date: 2011-11-09 22:06+0000\n" +"PO-Revision-Date: 2011-11-14 10:44+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -103,19 +103,19 @@ msgid "Zoom to fit image width" msgstr "Ampliar para ajustar a la anchura de la imagen" -#: ../plugins/map/eog-map-plugin.c:363 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Saltar a la ubicación de la imagen actual" -#: ../plugins/map/eog-map-plugin.c:375 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Ampliar" -#: ../plugins/map/eog-map-plugin.c:383 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Reducir" -#: ../plugins/map/eog-map-plugin.c:397 +#: ../plugins/map/eog-map-plugin.c:430 #: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Mapa" @@ -124,54 +124,54 @@ msgid "Display the geolocation of the image on a map" msgstr "Mostrar la geolocalización de la imagen en un mapa" -#: ../plugins/postasa/eog-postasa-plugin.c:127 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" msgstr "Cargar en PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:129 +#: ../plugins/postasa/eog-postasa-plugin.c:128 #: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Cargar sus imágenes en PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:324 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "Cargando…" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Cargadas" -#: ../plugins/postasa/eog-postasa-plugin.c:374 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Cancelado" -#: ../plugins/postasa/eog-postasa-plugin.c:377 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Falló" -#: ../plugins/postasa/eog-postasa-plugin.c:600 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "Falló el inicio de sesión. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:604 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "Inicio de sesión correcto." -#: ../plugins/postasa/eog-postasa-plugin.c:605 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Cerrar" -#: ../plugins/postasa/eog-postasa-plugin.c:626 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Cancelar" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:632 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "Iniciando sesión…" -#: ../plugins/postasa/eog-postasa-plugin.c:677 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "Inicie sesión para continuar subiendo imágenes." @@ -180,22 +180,18 @@ msgstr "Inicio de sesión en PicasaWeb" #: ../plugins/postasa/postasa-config.xml.h:2 -#| msgid "Cancel" msgid "_Cancel" msgstr "_Cancelar" #: ../plugins/postasa/postasa-config.xml.h:3 -#| msgid "Login" msgid "_Login" msgstr "_Entrada" #: ../plugins/postasa/postasa-config.xml.h:4 -#| msgid "Password" msgid "_Password:" msgstr "C_ontraseña:" #: ../plugins/postasa/postasa-config.xml.h:5 -#| msgid "Username" msgid "_Username:" msgstr "Nombre de _usuario:" @@ -208,6 +204,19 @@ msgstr "Cancelar seleccionadas" #: ../plugins/postasa/postasa-uploads.xml.h:3 +#| msgid "Failed" +msgid "File" +msgstr "Archivo" + +#: ../plugins/postasa/postasa-uploads.xml.h:4 +msgid "Size" +msgstr "Tamaño" + +#: ../plugins/postasa/postasa-uploads.xml.h:5 +msgid "Status" +msgstr "Estado" + +#: ../plugins/postasa/postasa-uploads.xml.h:6 msgid "Uploads:" msgstr "Subidas:" diff -Nru eog-plugins-3.1.2/po/fr.po eog-plugins-3.2.2/po/fr.po --- eog-plugins-3.1.2/po/fr.po 2011-01-16 19:42:45.000000000 +0000 +++ eog-plugins-3.2.2/po/fr.po 2011-09-21 15:57:49.000000000 +0000 @@ -1,29 +1,29 @@ # French translation of eog-plugins. -# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# Copyright (C) 2007-2011 Free Software Foundation, Inc. # This file is distributed under the same license as the eog-plugins package. # Ivan Buresi , 2007. -# Claude Paroz , 2009-2010 +# Claude Paroz , 2009-2011 # msgid "" msgstr "" "Project-Id-Version: eog-plugins HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=eog-" -"plugins&component=general\n" -"POT-Creation-Date: 2010-02-10 19:23+0000\n" -"PO-Revision-Date: 2010-02-13 11:22+0100\n" +"plugins&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-07-11 20:36+0000\n" +"PO-Revision-Date: 2011-09-16 16:49+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../plugins/exif-display/eog-exif-display-plugin.c:136 +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" msgstr " (Unicode non valide)" #. TRANSLATORS: This is the actual focal length used when #. the image was taken. -#: ../plugins/exif-display/eog-exif-display-plugin.c:212 +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" msgstr "%.1f mm (lentille)" @@ -31,7 +31,7 @@ #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming #. a 35mm film camera. -#: ../plugins/exif-display/eog-exif-display-plugin.c:223 +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 #, c-format msgid "%.1fmm (35mm film)" msgstr "%.1f mm (film 35 mm)" @@ -56,11 +56,11 @@ msgid "Display per-channel histogram" msgstr "Afficher un histogramme par canal" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:1 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 msgid "Displays camera settings and histogram" msgstr "Affiche les paramètres de l'appareil et l'histogramme" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:2 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 msgid "Exif display" msgstr "Affichage Exif" @@ -92,103 +92,106 @@ msgid "Zoom:" msgstr "Zoom :" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:85 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 msgid "Fit to width" msgstr "Adapter à la largeur" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:87 -#: ../plugins/fit-to-width/fit-to-width.eog-plugin.desktop.in.h:1 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 msgid "Zoom to fit image width" msgstr "Zoom en fonction de la largeur de l'image" -#: ../plugins/map/eog-map-plugin.c:321 +#: ../plugins/map/eog-map-plugin.c:363 msgid "Jump to current image's location" msgstr "Aller à l'emplacement de l'image actuelle" -#: ../plugins/map/eog-map-plugin.c:333 +#: ../plugins/map/eog-map-plugin.c:375 msgid "Zoom in" msgstr "Zoom avant" -#: ../plugins/map/eog-map-plugin.c:341 +#: ../plugins/map/eog-map-plugin.c:383 msgid "Zoom out" msgstr "Zoom arrière" -#: ../plugins/map/eog-map-plugin.c:355 -#: ../plugins/map/map.eog-plugin.desktop.in.h:2 +#: ../plugins/map/eog-map-plugin.c:397 +#: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Carte" -#: ../plugins/map/map.eog-plugin.desktop.in.h:1 +#: ../plugins/map/map.plugin.desktop.in.h:1 msgid "Display the geolocation of the image on a map" msgstr "Affiche la position géographique de l'image sur une carte" -#: ../plugins/postasa/eog-postasa-plugin.c:124 +#: ../plugins/postasa/eog-postasa-plugin.c:127 msgid "Upload to PicasaWeb" msgstr "Mettre en ligne sur PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:126 -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:2 +#: ../plugins/postasa/eog-postasa-plugin.c:129 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Met en ligne vos photos sur PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:321 +#: ../plugins/postasa/eog-postasa-plugin.c:324 msgid "Uploading..." msgstr "Envoi des images..." -#: ../plugins/postasa/eog-postasa-plugin.c:368 +#: ../plugins/postasa/eog-postasa-plugin.c:370 msgid "Uploaded" msgstr "Mise en ligne terminée" -#: ../plugins/postasa/eog-postasa-plugin.c:372 +#: ../plugins/postasa/eog-postasa-plugin.c:374 msgid "Cancelled" msgstr "Annulé" -#: ../plugins/postasa/eog-postasa-plugin.c:375 +#: ../plugins/postasa/eog-postasa-plugin.c:377 msgid "Failed" msgstr "Échec" -#: ../plugins/postasa/eog-postasa-plugin.c:523 +#: ../plugins/postasa/eog-postasa-plugin.c:600 #, c-format msgid "Login failed. %s" msgstr "Échec de connexion. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:527 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Logged in successully." msgstr "Connexion réussie." -#: ../plugins/postasa/eog-postasa-plugin.c:528 +#: ../plugins/postasa/eog-postasa-plugin.c:605 msgid "Close" msgstr "Fermer" -#: ../plugins/postasa/eog-postasa-plugin.c:549 -#: ../plugins/postasa/postasa-config.xml.h:1 +#: ../plugins/postasa/eog-postasa-plugin.c:626 msgid "Cancel" msgstr "Annuler" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:555 +#: ../plugins/postasa/eog-postasa-plugin.c:632 msgid "Logging in..." msgstr "Connexion en cours..." -#: ../plugins/postasa/eog-postasa-plugin.c:583 +#: ../plugins/postasa/eog-postasa-plugin.c:677 msgid "Please log in to continue upload." msgstr "Veuillez vous connecter pour continuer le téléversement." +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "Connexion PicasaWeb" + #: ../plugins/postasa/postasa-config.xml.h:2 -msgid "Login" -msgstr "Se connecter" +msgid "_Cancel" +msgstr "_Annuler" #: ../plugins/postasa/postasa-config.xml.h:3 -msgid "Password" -msgstr "Mot de passe" +msgid "_Login" +msgstr "Se _connecter" #: ../plugins/postasa/postasa-config.xml.h:4 -msgid "PicasaWeb Login" -msgstr "Connexion PicasaWeb" +msgid "_Password:" +msgstr "_Mot de passe" #: ../plugins/postasa/postasa-config.xml.h:5 -msgid "Username" -msgstr "Nom d'utilisateur" +msgid "_Username:" +msgstr "Nom d'_utilisateur" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -202,51 +205,51 @@ msgid "Uploads:" msgstr "Téléversements :" -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:1 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" msgstr "Mise en ligne sur PicasaWeb" -#: ../plugins/postr/eog-postr-plugin.c:57 +#: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" msgstr "Mettre en ligne sur Flickr" -#: ../plugins/postr/eog-postr-plugin.c:59 -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:2 +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 msgid "Upload your pictures to Flickr" msgstr "Met en ligne vos photos sur Flickr" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:1 +#: ../plugins/postr/postr.plugin.desktop.in.h:1 msgid "Flickr Uploader" msgstr "Mise en ligne sur Flickr" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:1 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" msgstr "Console Python" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:2 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 msgid "Python console for Eye of GNOME" msgstr "Console Python pour Eye of GNOME" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:60 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 msgid "Send by Mail" msgstr "Envoyer par courriel" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:62 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 msgid "Send the selected images by mail" msgstr "Envoie les images sélectionnées par courriel" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:1 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 msgid "Send By Mail" msgstr "Envoi par courriel" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:2 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 msgid "Sends an image attached to a new mail" msgstr "Envoie une image en pièce jointe d'un nouveau courriel" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:1 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 msgid "Shuffles images in slideshow mode" msgstr "Mélange les images en mode diaporama" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:2 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 msgid "Slideshow Shuffle" msgstr "Diaporama aléatoire" diff -Nru eog-plugins-3.1.2/po/hu.po eog-plugins-3.2.2/po/hu.po --- eog-plugins-3.1.2/po/hu.po 2011-01-16 19:42:45.000000000 +0000 +++ eog-plugins-3.2.2/po/hu.po 2011-09-21 15:57:49.000000000 +0000 @@ -1,30 +1,31 @@ # Hungarian translation of eog-plugins -# Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the eog-plugins package. # # Gergely Szarka , 2009. -# Gabor Kelemen , 2009, 2010. +# Gabor Kelemen , 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: eog-plugins master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-11 22:07+0100\n" -"PO-Revision-Date: 2010-02-11 22:20+0100\n" +"POT-Creation-Date: 2011-09-21 16:07+0200\n" +"PO-Revision-Date: 2011-09-21 16:08+0200\n" "Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"Language-Team: Hungarian \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../plugins/exif-display/eog-exif-display-plugin.c:136 +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" msgstr " (érvénytelen Unicode)" #. TRANSLATORS: This is the actual focal length used when #. the image was taken. -#: ../plugins/exif-display/eog-exif-display-plugin.c:212 +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" msgstr "%.1fmm (lencse)" @@ -32,7 +33,7 @@ #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming #. a 35mm film camera. -#: ../plugins/exif-display/eog-exif-display-plugin.c:223 +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 #, c-format msgid "%.1fmm (35mm film)" msgstr "%.1fmm (35mm film)" @@ -57,11 +58,11 @@ msgid "Display per-channel histogram" msgstr "Csatornánkénti hisztogram megjelenítése" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:1 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 msgid "Displays camera settings and histogram" msgstr "Hisztogram és a fényképezőgép beállításainak megjelenítése" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:2 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 msgid "Exif display" msgstr "Exif adatok megjelenítése" @@ -93,103 +94,106 @@ msgid "Zoom:" msgstr "Nagyítás:" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:85 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 msgid "Fit to width" msgstr "Szélesség illesztése" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:87 -#: ../plugins/fit-to-width/fit-to-width.eog-plugin.desktop.in.h:1 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 msgid "Zoom to fit image width" msgstr "Illesztés a kép szélességéhez" -#: ../plugins/map/eog-map-plugin.c:321 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Ugrás a jelenlegi kép helyére" -#: ../plugins/map/eog-map-plugin.c:333 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Nagyítás" -#: ../plugins/map/eog-map-plugin.c:341 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Kicsinyítés" -#: ../plugins/map/eog-map-plugin.c:355 -#: ../plugins/map/map.eog-plugin.desktop.in.h:2 +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Térkép" -#: ../plugins/map/map.eog-plugin.desktop.in.h:1 +#: ../plugins/map/map.plugin.desktop.in.h:1 msgid "Display the geolocation of the image on a map" msgstr "A kép földrajzi elhelyezkedésének jelölése a térképen" -#: ../plugins/postasa/eog-postasa-plugin.c:124 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" msgstr "Feltöltés a Picasawebre" -#: ../plugins/postasa/eog-postasa-plugin.c:126 -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:2 +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Képek feltöltése a Picasawebre" -#: ../plugins/postasa/eog-postasa-plugin.c:321 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "Feltöltés…" -#: ../plugins/postasa/eog-postasa-plugin.c:368 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Feltöltve" -#: ../plugins/postasa/eog-postasa-plugin.c:372 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Megszakítva" -#: ../plugins/postasa/eog-postasa-plugin.c:375 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Sikertelen" -#: ../plugins/postasa/eog-postasa-plugin.c:523 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "A bejelentkezés meghiúsult. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:527 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "A bejelentkezés sikerült." -#: ../plugins/postasa/eog-postasa-plugin.c:528 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Bezárás" -#: ../plugins/postasa/eog-postasa-plugin.c:549 -#: ../plugins/postasa/postasa-config.xml.h:1 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Mégse" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:555 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "Bejelentkezés…" -#: ../plugins/postasa/eog-postasa-plugin.c:583 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "Jelentkezzen be a feltöltés folytatásához." +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "PicasaWeb bejelentkezés" + #: ../plugins/postasa/postasa-config.xml.h:2 -msgid "Login" -msgstr "Bejelentkezés" +msgid "_Cancel" +msgstr "Mé_gse" #: ../plugins/postasa/postasa-config.xml.h:3 -msgid "Password" -msgstr "Jelszó" +msgid "_Login" +msgstr "_Bejelentkezés" #: ../plugins/postasa/postasa-config.xml.h:4 -msgid "PicasaWeb Login" -msgstr "PicasaWeb bejelentkezés" +msgid "_Password:" +msgstr "_Jelszó:" #: ../plugins/postasa/postasa-config.xml.h:5 -msgid "Username" -msgstr "Felhasználónév" +msgid "_Username:" +msgstr "_Felhasználónév:" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -203,52 +207,52 @@ msgid "Uploads:" msgstr "Feltöltések:" -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:1 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" msgstr "Picasaweb feltöltő" -#: ../plugins/postr/eog-postr-plugin.c:57 +#: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" msgstr "Feltöltés a Flickr-re" -#: ../plugins/postr/eog-postr-plugin.c:59 -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:2 +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 msgid "Upload your pictures to Flickr" msgstr "Képek feltöltése a Flickr-re" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:1 +#: ../plugins/postr/postr.plugin.desktop.in.h:1 msgid "Flickr Uploader" msgstr "Flickr feltöltő" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:1 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" msgstr "Python konzol" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:2 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 msgid "Python console for Eye of GNOME" msgstr "Python konzol az Eye of GNOME programhoz" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:60 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 msgid "Send by Mail" msgstr "Küldés e-mailben" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:62 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 msgid "Send the selected images by mail" msgstr "Kiválasztott képek küldése e-mailben" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:1 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 msgid "Send By Mail" msgstr "Küldés e-mailben" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:2 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 msgid "Sends an image attached to a new mail" msgstr "Kép küldése egy új e-mailhez csatolva" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:1 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 msgid "Shuffles images in slideshow mode" msgstr "Képek keverése a diavetítés nézetben" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:2 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 msgid "Slideshow Shuffle" msgstr "Diavetítés véletlenszerűen" diff -Nru eog-plugins-3.1.2/po/it.po eog-plugins-3.2.2/po/it.po --- eog-plugins-3.1.2/po/it.po 2011-01-16 19:42:45.000000000 +0000 +++ eog-plugins-3.2.2/po/it.po 2011-09-22 12:48:25.000000000 +0000 @@ -1,30 +1,29 @@ # Italian translation og Eye of GNOME plugins. # Copyright (C) 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the eog-plugins package. -# Gianvito Cavasoli , 2009, 2010. -# +# Gianvito Cavasoli , 2009, 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: eog-plugins\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=eog-" -"plugins&component=general\n" -"POT-Creation-Date: 2010-02-15 18:55+0000\n" -"PO-Revision-Date: 2010-02-16 12:39+0100\n" -"Last-Translator: Gianvito Cavasoli \n" +"plugins&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-07-29 17:37+0000\n" +"PO-Revision-Date: 2011-08-28 11:45+0200\n" +"Last-Translator: Gianvito Cavasoli \n" "Language-Team: Italiana \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../plugins/exif-display/eog-exif-display-plugin.c:136 +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" msgstr " (Unicode non valido)" #. TRANSLATORS: This is the actual focal length used when #. the image was taken. -#: ../plugins/exif-display/eog-exif-display-plugin.c:212 +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" msgstr "%.1fmm (obiettivo)" @@ -32,7 +31,7 @@ #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming #. a 35mm film camera. -#: ../plugins/exif-display/eog-exif-display-plugin.c:223 +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 #, c-format msgid "%.1fmm (35mm film)" msgstr "%.1fmm (equiv. 35mm)" @@ -57,11 +56,11 @@ msgid "Display per-channel histogram" msgstr "Visualizzare istogramma per canale" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:1 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 msgid "Displays camera settings and histogram" msgstr "Visualizza le impostazioni della fotocamera e l'istogramma" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:2 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 msgid "Exif display" msgstr "Visualizza dati Exif" @@ -93,103 +92,106 @@ msgid "Zoom:" msgstr "Ingrandimento:" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:85 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 msgid "Fit to width" msgstr "Adatta alla larghezza" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:87 -#: ../plugins/fit-to-width/fit-to-width.eog-plugin.desktop.in.h:1 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 msgid "Zoom to fit image width" msgstr "Ingrandisce per adattare l'immagine alla larghezza" -#: ../plugins/map/eog-map-plugin.c:321 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Va all'attuale posizione dell'immagine" -#: ../plugins/map/eog-map-plugin.c:333 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Aumenta l'ingrandimento" -#: ../plugins/map/eog-map-plugin.c:341 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Diminuisce l'ingrandimento" -#: ../plugins/map/eog-map-plugin.c:355 -#: ../plugins/map/map.eog-plugin.desktop.in.h:2 +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Mappa" -#: ../plugins/map/map.eog-plugin.desktop.in.h:1 +#: ../plugins/map/map.plugin.desktop.in.h:1 msgid "Display the geolocation of the image on a map" msgstr "Visualizza la posizione geografica dell'immagine su una mappa" -#: ../plugins/postasa/eog-postasa-plugin.c:124 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" msgstr "Carica su PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:126 -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:2 +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Carica le immagini su PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:320 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "Caricamento..." -#: ../plugins/postasa/eog-postasa-plugin.c:366 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Caricate" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Annullate" -#: ../plugins/postasa/eog-postasa-plugin.c:373 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Non riuscito" -#: ../plugins/postasa/eog-postasa-plugin.c:520 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "Accesso non riuscito. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:524 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "Accesso effettuato con successo." -#: ../plugins/postasa/eog-postasa-plugin.c:525 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Chiudi" -#: ../plugins/postasa/eog-postasa-plugin.c:546 -#: ../plugins/postasa/postasa-config.xml.h:1 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Annulla" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:552 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "Accesso in corso..." -#: ../plugins/postasa/eog-postasa-plugin.c:580 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "Accedere per continuare il caricamento." +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "Acesso PicasaWeb" + #: ../plugins/postasa/postasa-config.xml.h:2 -msgid "Login" -msgstr "Accesso" +msgid "_Cancel" +msgstr "_Annulla" #: ../plugins/postasa/postasa-config.xml.h:3 -msgid "Password" -msgstr "Password" +msgid "_Login" +msgstr "A_ccedi" #: ../plugins/postasa/postasa-config.xml.h:4 -msgid "PicasaWeb Login" -msgstr "Acesso PicasaWeb" +msgid "_Password:" +msgstr "Pass_word:" #: ../plugins/postasa/postasa-config.xml.h:5 -msgid "Username" -msgstr "Nome utente" +msgid "_Username:" +msgstr "Nome _utente:" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -203,51 +205,51 @@ msgid "Uploads:" msgstr "Caricamenti:" -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:1 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" msgstr "Caricatore PicasaWeb" -#: ../plugins/postr/eog-postr-plugin.c:57 +#: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" msgstr "Carica su Flickr" -#: ../plugins/postr/eog-postr-plugin.c:59 -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:2 +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 msgid "Upload your pictures to Flickr" msgstr "Carica le immagini su Flickr" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:1 +#: ../plugins/postr/postr.plugin.desktop.in.h:1 msgid "Flickr Uploader" msgstr "Caricatore Flickr" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:1 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" msgstr "Console Python" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:2 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 msgid "Python console for Eye of GNOME" msgstr "Console Python per Eye of GNOME" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:60 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 msgid "Send by Mail" msgstr "Invia per email" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:62 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 msgid "Send the selected images by mail" msgstr "Invia le immagini selezionate via email" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:1 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 msgid "Send By Mail" msgstr "Invia per email" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:2 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 msgid "Sends an image attached to a new mail" msgstr "Invia un'immagine allegandola a una nuova email" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:1 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 msgid "Shuffles images in slideshow mode" msgstr "Mischia le immagini nella modalità diapositive" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:2 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 msgid "Slideshow Shuffle" msgstr "Mischia diapositive" diff -Nru eog-plugins-3.1.2/po/ja.po eog-plugins-3.2.2/po/ja.po --- eog-plugins-3.1.2/po/ja.po 2011-07-12 15:25:33.000000000 +0000 +++ eog-plugins-3.2.2/po/ja.po 2011-09-21 15:57:49.000000000 +0000 @@ -6,15 +6,16 @@ msgid "" msgstr "" "Project-Id-Version: eog-plugins master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-12 07:18+0900\n" -"PO-Revision-Date: 2011-07-12 07:18+0900\n" -"Last-Translator: Takeshi AIHANA \n" -"Language-Team: Japanese \n" -"Language: ja\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=eog-" +"plugins&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-09-16 14:50+0000\n" +"PO-Revision-Date: 2011-09-18 17:43+0900\n" +"Last-Translator: Yasumichi Akahoshi \n" +"Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" #: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" @@ -102,19 +103,19 @@ msgid "Zoom to fit image width" msgstr "画像の幅にズームを合わせる" -#: ../plugins/map/eog-map-plugin.c:363 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "この画像の撮影場所へジャンプします" -#: ../plugins/map/eog-map-plugin.c:375 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "拡大します" -#: ../plugins/map/eog-map-plugin.c:383 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "縮小します" -#: ../plugins/map/eog-map-plugin.c:397 +#: ../plugins/map/eog-map-plugin.c:430 #: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "マップ" @@ -123,54 +124,54 @@ msgid "Display the geolocation of the image on a map" msgstr "画像に含まれた情報から地理的位置をマップに表示します" -#: ../plugins/postasa/eog-postasa-plugin.c:127 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" msgstr "PicasaWeb へアップロード" -#: ../plugins/postasa/eog-postasa-plugin.c:129 +#: ../plugins/postasa/eog-postasa-plugin.c:128 #: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "お気に入りの写真を PicasaWeb へアップロードします" -#: ../plugins/postasa/eog-postasa-plugin.c:324 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "アップロード中..." -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "アップロード完了" -#: ../plugins/postasa/eog-postasa-plugin.c:374 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "キャンセルしました" -#: ../plugins/postasa/eog-postasa-plugin.c:377 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "失敗しました" -#: ../plugins/postasa/eog-postasa-plugin.c:600 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "ログインできませんでした: %s" -#: ../plugins/postasa/eog-postasa-plugin.c:604 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "ログインが完了しました" -#: ../plugins/postasa/eog-postasa-plugin.c:605 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "閉じる" -#: ../plugins/postasa/eog-postasa-plugin.c:626 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "キャンセル" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:632 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "ログイン中..." -#: ../plugins/postasa/eog-postasa-plugin.c:677 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "アップロードするにはログインが必要です。" @@ -192,7 +193,7 @@ #: ../plugins/postasa/postasa-config.xml.h:5 msgid "_Username:" -msgstr "ユーザ名(_U):" +msgstr "ユーザー名(_U):" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -208,7 +209,7 @@ #: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" -msgstr "PicasaWeb アップローダ" +msgstr "PicasaWeb アップローダー" #: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" @@ -221,7 +222,7 @@ #: ../plugins/postr/postr.plugin.desktop.in.h:1 msgid "Flickr Uploader" -msgstr "Flickr アップローダ" +msgstr "Flickr アップローダー" #: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" @@ -249,8 +250,8 @@ #: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 msgid "Shuffles images in slideshow mode" -msgstr "スライドショー・モードで画像の並びをシャッフルします" +msgstr "スライドショーモードで画像の並びをシャッフルします" #: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 msgid "Slideshow Shuffle" -msgstr "スライドショー・シャッフル" +msgstr "スライドショーシャッフル" diff -Nru eog-plugins-3.1.2/po/ko.po eog-plugins-3.2.2/po/ko.po --- eog-plugins-3.1.2/po/ko.po 1970-01-01 00:00:00.000000000 +0000 +++ eog-plugins-3.2.2/po/ko.po 2011-09-26 20:21:09.000000000 +0000 @@ -0,0 +1,260 @@ +# eog-plugins ko.po +# This file is distributed under the same license as the eog-plugins package. +# +# Changwoo Ryu , 2011. +# +# 주의 +# - 카메라 관련 전문 용어가 많으므로 기존에 쓰이는 용어를 찾아서 사용한다. +# - Flickr는 '플리커'로 표기 +# - PicasaWeb은 '피카사웹'으로 표기 +# +msgid "" +msgstr "" +"Project-Id-Version: eog\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=eog-plugins&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-09-26 00:10+0900\n" +"PO-Revision-Date: 2011-09-26 00:21+0900\n" +"Last-Translator: Changwoo Ryu \n" +"Language-Team: GNOME Korea \n" +"Language: Korean\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 +msgid " (invalid Unicode)" +msgstr " (잘못된 유니코드)" + +#. TRANSLATORS: This is the actual focal length used when +#. the image was taken. +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 +#, c-format +msgid "%.1fmm (lens)" +msgstr "%.1fmm (렌즈)" + +#. Print as float to get a similar look as above. +#. TRANSLATORS: This is the equivalent focal length assuming +#. a 35mm film camera. +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 +#, c-format +msgid "%.1fmm (35mm film)" +msgstr "%.1fmm (35mm 필름)" + +#: ../plugins/exif-display/exif-display-config.ui.h:1 +msgid "General" +msgstr "일반" + +#: ../plugins/exif-display/exif-display-config.ui.h:2 +msgid "Histogram" +msgstr "히스토그램" + +#: ../plugins/exif-display/exif-display-config.ui.h:3 +msgid "Display RGB histogram" +msgstr "RGB 히스토그램 표시" + +#: ../plugins/exif-display/exif-display-config.ui.h:4 +msgid "Display camera settings in statusbar" +msgstr "카메라 설정을 상태 표시줄에 표시" + +#: ../plugins/exif-display/exif-display-config.ui.h:5 +msgid "Display per-channel histogram" +msgstr "채널별 히스토그램 표시" + +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 +msgid "Displays camera settings and histogram" +msgstr "카메라 설정과 히스토그램 표시" + +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 +msgid "Exif display" +msgstr "EXIF 표시" + +#: ../plugins/exif-display/exif-display.ui.h:1 +msgid "Aperture:" +msgstr "조리개:" + +#: ../plugins/exif-display/exif-display.ui.h:2 +msgid "Description:" +msgstr "설명:" + +#: ../plugins/exif-display/exif-display.ui.h:3 +msgid "Expo. Time:" +msgstr "노출 시간:" + +#: ../plugins/exif-display/exif-display.ui.h:4 +msgid "Expo. bias:" +msgstr "노출 보정:" + +#: ../plugins/exif-display/exif-display.ui.h:5 +msgid "ISO speed:" +msgstr "ISO 값:" + +#: ../plugins/exif-display/exif-display.ui.h:6 +msgid "Metering:" +msgstr "측광 방식:" + +#: ../plugins/exif-display/exif-display.ui.h:7 +msgid "Zoom:" +msgstr "확대:" + +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 +msgid "Fit to width" +msgstr "너비에 맞추기" + +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 +msgid "Zoom to fit image width" +msgstr "그림 너비에 맞춰 확대/축소" + +#: ../plugins/map/eog-map-plugin.c:396 +msgid "Jump to current image's location" +msgstr "현재 이미지의 위치로 이동" + +#: ../plugins/map/eog-map-plugin.c:408 +msgid "Zoom in" +msgstr "확대" + +#: ../plugins/map/eog-map-plugin.c:416 +msgid "Zoom out" +msgstr "축소" + +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 +msgid "Map" +msgstr "지도" + +#: ../plugins/map/map.plugin.desktop.in.h:1 +msgid "Display the geolocation of the image on a map" +msgstr "지도에서 사진의 지리적 위치를 표시합니다" + +#: ../plugins/postasa/eog-postasa-plugin.c:126 +msgid "Upload to PicasaWeb" +msgstr "피카사웹에 업로드" + +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 +msgid "Upload your pictures to PicasaWeb" +msgstr "사진을 피카사웹에 업로드합니다" + +#: ../plugins/postasa/eog-postasa-plugin.c:323 +msgid "Uploading..." +msgstr "업로드 중..." + +#: ../plugins/postasa/eog-postasa-plugin.c:369 +msgid "Uploaded" +msgstr "업로드함" + +#: ../plugins/postasa/eog-postasa-plugin.c:373 +msgid "Cancelled" +msgstr "취소함" + +#: ../plugins/postasa/eog-postasa-plugin.c:376 +msgid "Failed" +msgstr "실패함" + +#: ../plugins/postasa/eog-postasa-plugin.c:599 +#, c-format +msgid "Login failed. %s" +msgstr "로그인 실패. %s" + +#: ../plugins/postasa/eog-postasa-plugin.c:603 +msgid "Logged in successully." +msgstr "성공적으로 로그인." + +#: ../plugins/postasa/eog-postasa-plugin.c:604 +msgid "Close" +msgstr "닫기" + +#: ../plugins/postasa/eog-postasa-plugin.c:625 +msgid "Cancel" +msgstr "취소" + +#. TODO: want to handle passwords more securely +#: ../plugins/postasa/eog-postasa-plugin.c:631 +msgid "Logging in..." +msgstr "로그인하는 중..." + +#: ../plugins/postasa/eog-postasa-plugin.c:676 +msgid "Please log in to continue upload." +msgstr "업로드를 계속 하려면 로그인하십시오." + +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "피카사웹 로그인" + +#: ../plugins/postasa/postasa-config.xml.h:2 +msgid "_Cancel" +msgstr "취소(_C)" + +#: ../plugins/postasa/postasa-config.xml.h:3 +msgid "_Login" +msgstr "로그인(_L)" + +#: ../plugins/postasa/postasa-config.xml.h:4 +msgid "_Password:" +msgstr "암호(_P):" + +#: ../plugins/postasa/postasa-config.xml.h:5 +msgid "_Username:" +msgstr "사용자 이름(_U):" + +#: ../plugins/postasa/postasa-uploads.xml.h:1 +msgid "Cancel All" +msgstr "모두 취소" + +#: ../plugins/postasa/postasa-uploads.xml.h:2 +msgid "Cancel Selected" +msgstr "선택 취소" + +#: ../plugins/postasa/postasa-uploads.xml.h:3 +msgid "Uploads:" +msgstr "업로드:" + +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 +msgid "PicasaWeb Uploader" +msgstr "피카사웹 업로드" + +#: ../plugins/postr/eog-postr-plugin.c:62 +msgid "Upload to Flickr" +msgstr "플리커에 업로드" + +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 +msgid "Upload your pictures to Flickr" +msgstr "사진을 플리커에 업로드합니다" + +#: ../plugins/postr/postr.plugin.desktop.in.h:1 +msgid "Flickr Uploader" +msgstr "플리커 업로드" + +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 +msgid "Python Console" +msgstr "파이썬 콘솔" + +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 +msgid "Python console for Eye of GNOME" +msgstr "그놈의 눈 파이썬 콘솔" + +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 +msgid "Send by Mail" +msgstr "메일로 보내기" + +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 +msgid "Send the selected images by mail" +msgstr "선택한 그림을 메일로 보냅니다" + +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 +msgid "Send By Mail" +msgstr "메일로 보내기" + +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 +msgid "Sends an image attached to a new mail" +msgstr "그림을 메일에 첨부해서 보냅니다" + +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 +msgid "Shuffles images in slideshow mode" +msgstr "슬라이드쇼 모드에서 임의 그림 열기" + +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 +msgid "Slideshow Shuffle" +msgstr "슬라이드 쇼 임의 모드" diff -Nru eog-plugins-3.1.2/po/LINGUAS eog-plugins-3.2.2/po/LINGUAS --- eog-plugins-3.1.2/po/LINGUAS 2011-06-10 19:56:07.000000000 +0000 +++ eog-plugins-3.2.2/po/LINGUAS 2011-10-20 10:20:20.000000000 +0000 @@ -26,7 +26,9 @@ it ja kn +ko lt +lv mk ml mr diff -Nru eog-plugins-3.1.2/po/lv.po eog-plugins-3.2.2/po/lv.po --- eog-plugins-3.1.2/po/lv.po 1970-01-01 00:00:00.000000000 +0000 +++ eog-plugins-3.2.2/po/lv.po 2011-10-20 10:20:20.000000000 +0000 @@ -0,0 +1,258 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Rūdofls Mazurs , 2011. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=eog-plugins&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-09-26 20:28+0000\n" +"PO-Revision-Date: 2011-09-30 01:55+0300\n" +"Last-Translator: Rūdofls Mazurs \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lv\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" + +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 +msgid " (invalid Unicode)" +msgstr " (nederīgs Unicode)" + +#. TRANSLATORS: This is the actual focal length used when +#. the image was taken. +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 +#, c-format +msgid "%.1fmm (lens)" +msgstr "%.1fmm (lēca)" + +#. Print as float to get a similar look as above. +#. TRANSLATORS: This is the equivalent focal length assuming +#. a 35mm film camera. +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 +#, c-format +msgid "%.1fmm (35mm film)" +msgstr "%.1fmm (35mm filma)" + +#: ../plugins/exif-display/exif-display-config.ui.h:1 +msgid "General" +msgstr "Vispārējs" + +#: ../plugins/exif-display/exif-display-config.ui.h:2 +msgid "Histogram" +msgstr "Histogramma" + +#: ../plugins/exif-display/exif-display-config.ui.h:3 +msgid "Display RGB histogram" +msgstr "Rādīt RGB histogrammu" + +#: ../plugins/exif-display/exif-display-config.ui.h:4 +msgid "Display camera settings in statusbar" +msgstr "Rādīt kameras iestatījumus statusa joslā" + +#: ../plugins/exif-display/exif-display-config.ui.h:5 +msgid "Display per-channel histogram" +msgstr "Rādīt histogrammu katram kanālam" + +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 +msgid "Displays camera settings and histogram" +msgstr "Rāda kameras iestatījumus un histogrammu" + +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 +msgid "Exif display" +msgstr "Exif attēlošana" + +#: ../plugins/exif-display/exif-display.ui.h:1 +msgid "Aperture:" +msgstr "Diafragma:" + +#: ../plugins/exif-display/exif-display.ui.h:2 +msgid "Description:" +msgstr "Apraksts:" + +#: ../plugins/exif-display/exif-display.ui.h:3 +msgid "Expo. Time:" +msgstr "Ekspozīcija:" + +#: ../plugins/exif-display/exif-display.ui.h:4 +msgid "Expo. bias:" +msgstr "Ekspozīcijas nobīde:" + +#: ../plugins/exif-display/exif-display.ui.h:5 +msgid "ISO speed:" +msgstr "ISO ātrums:" + +#: ../plugins/exif-display/exif-display.ui.h:6 +msgid "Metering:" +msgstr "Mērīšana:" + +#: ../plugins/exif-display/exif-display.ui.h:7 +msgid "Zoom:" +msgstr "Palielinājums:" + +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 +msgid "Fit to width" +msgstr "Piekārtot platumam" + +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 +msgid "Zoom to fit image width" +msgstr "Pielāgot attēla platumam" + +#: ../plugins/map/eog-map-plugin.c:396 +msgid "Jump to current image's location" +msgstr "Lekt uz pašreizējā attāla vietu" + +#: ../plugins/map/eog-map-plugin.c:408 +msgid "Zoom in" +msgstr "Tuvināt" + +#: ../plugins/map/eog-map-plugin.c:416 +msgid "Zoom out" +msgstr "Tālināt" + +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 +msgid "Map" +msgstr "Karte" + +#: ../plugins/map/map.plugin.desktop.in.h:1 +msgid "Display the geolocation of the image on a map" +msgstr "Attēlot attēla ģeogrāfisko vietu uz kartes" + +#: ../plugins/postasa/eog-postasa-plugin.c:126 +msgid "Upload to PicasaWeb" +msgstr "Augšupielādēt uz PicasaWeb" + +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 +msgid "Upload your pictures to PicasaWeb" +msgstr "Augšupielādējiet savas bildes uz PicasaWeb" + +#: ../plugins/postasa/eog-postasa-plugin.c:323 +msgid "Uploading..." +msgstr "Augšupielādē..." + +#: ../plugins/postasa/eog-postasa-plugin.c:369 +msgid "Uploaded" +msgstr "Augšupielādēts" + +#: ../plugins/postasa/eog-postasa-plugin.c:373 +msgid "Cancelled" +msgstr "Atcelts" + +#: ../plugins/postasa/eog-postasa-plugin.c:376 +msgid "Failed" +msgstr "Neizdevās" + +#: ../plugins/postasa/eog-postasa-plugin.c:599 +#, c-format +msgid "Login failed. %s" +msgstr "Pieteikšanās neveiksmīga. %s" + +#: ../plugins/postasa/eog-postasa-plugin.c:603 +msgid "Logged in successully." +msgstr "Pieteicās veiksmīgi." + +#: ../plugins/postasa/eog-postasa-plugin.c:604 +msgid "Close" +msgstr "Aizvērt" + +#: ../plugins/postasa/eog-postasa-plugin.c:625 +msgid "Cancel" +msgstr "Atcelt" + +#. TODO: want to handle passwords more securely +#: ../plugins/postasa/eog-postasa-plugin.c:631 +msgid "Logging in..." +msgstr "Piesakās..." + +#: ../plugins/postasa/eog-postasa-plugin.c:676 +msgid "Please log in to continue upload." +msgstr "Piesakieties, lai varētu turpināt augšupielādi." + +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "PicasaWeb pieteikšanās" + +#: ../plugins/postasa/postasa-config.xml.h:2 +msgid "_Cancel" +msgstr "At_celt" + +#: ../plugins/postasa/postasa-config.xml.h:3 +msgid "_Login" +msgstr "_Pieteikties" + +#: ../plugins/postasa/postasa-config.xml.h:4 +msgid "_Password:" +msgstr "_Parole:" + +#: ../plugins/postasa/postasa-config.xml.h:5 +msgid "_Username:" +msgstr "_Lietotājvārds:" + +#: ../plugins/postasa/postasa-uploads.xml.h:1 +msgid "Cancel All" +msgstr "Atcelt Visu" + +#: ../plugins/postasa/postasa-uploads.xml.h:2 +msgid "Cancel Selected" +msgstr "Atcelt izvēlēto" + +#: ../plugins/postasa/postasa-uploads.xml.h:3 +msgid "Uploads:" +msgstr "Augšupielādes:" + +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 +msgid "PicasaWeb Uploader" +msgstr "PicasaWeb augšupielādētājs" + +#: ../plugins/postr/eog-postr-plugin.c:62 +msgid "Upload to Flickr" +msgstr "Augšupielādēt uz Flickr" + +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 +msgid "Upload your pictures to Flickr" +msgstr "Augšupielādējiet savas bildes uz Flickr" + +#: ../plugins/postr/postr.plugin.desktop.in.h:1 +msgid "Flickr Uploader" +msgstr "Flickr augšupielādētājs" + +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 +msgid "Python Console" +msgstr "Python konsole" + +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 +msgid "Python console for Eye of GNOME" +msgstr "Python konsole lietotnei Eye of GNOME" + +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 +msgid "Send by Mail" +msgstr "Sūtīt vēstuli" + +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 +msgid "Send the selected images by mail" +msgstr "Sūtīt izvēlētos attēlus caur pastu" + +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 +msgid "Send By Mail" +msgstr "Sūtīt vēstuli" + +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 +msgid "Sends an image attached to a new mail" +msgstr "Sūta attēlu, kas pievienots jaunai vēstulei" + +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 +msgid "Shuffles images in slideshow mode" +msgstr "Sajauc attēlus slīdrādes režīmā" + +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 +msgid "Slideshow Shuffle" +msgstr "Slīdrādes maisītājs" + diff -Nru eog-plugins-3.1.2/po/pl.po eog-plugins-3.2.2/po/pl.po --- eog-plugins-3.1.2/po/pl.po 2011-01-16 19:42:45.000000000 +0000 +++ eog-plugins-3.2.2/po/pl.po 2011-11-21 21:27:28.000000000 +0000 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: eog-plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-10 14:04+0100\n" -"PO-Revision-Date: 2010-03-10 11:56+0100\n" +"POT-Creation-Date: 2011-11-09 23:22+0100\n" +"PO-Revision-Date: 2011-11-09 22:23+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,13 +21,13 @@ "X-Poedit-Language: Polish\n" "X-Poedit-Country: Poland\n" -#: ../plugins/exif-display/eog-exif-display-plugin.c:136 +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" msgstr " (nieprawidłowe kodowanie Unicode)" #. TRANSLATORS: This is the actual focal length used when #. the image was taken. -#: ../plugins/exif-display/eog-exif-display-plugin.c:212 +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" msgstr "%.1fmm (obiektyw)" @@ -34,7 +35,7 @@ #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming #. a 35mm film camera. -#: ../plugins/exif-display/eog-exif-display-plugin.c:223 +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 #, c-format msgid "%.1fmm (35mm film)" msgstr "%.1fmm (film 35mm)" @@ -59,11 +60,11 @@ msgid "Display per-channel histogram" msgstr "Wyświetlanie histogramu na kanał" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:1 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 msgid "Displays camera settings and histogram" msgstr "Wyświetlanie ustawień aparatu i histogram" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:2 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 msgid "Exif display" msgstr "Wyświetlanie danych EXIF" @@ -95,103 +96,106 @@ msgid "Zoom:" msgstr "Przybliżenie:" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:85 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 msgid "Fit to width" msgstr "Dopasowanie do szerokości" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:87 -#: ../plugins/fit-to-width/fit-to-width.eog-plugin.desktop.in.h:1 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 msgid "Zoom to fit image width" msgstr "Przybliżanie obrazów, aby dopasować szerokość" -#: ../plugins/map/eog-map-plugin.c:321 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Przejdź do położenia bieżącego obrazu" -#: ../plugins/map/eog-map-plugin.c:333 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Przybliż" -#: ../plugins/map/eog-map-plugin.c:341 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Oddal" -#: ../plugins/map/eog-map-plugin.c:355 -#: ../plugins/map/map.eog-plugin.desktop.in.h:2 +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Mapa" -#: ../plugins/map/map.eog-plugin.desktop.in.h:1 +#: ../plugins/map/map.plugin.desktop.in.h:1 msgid "Display the geolocation of the image on a map" msgstr "Wyświetlanie położenia geograficznego obrazu na mapie" -#: ../plugins/postasa/eog-postasa-plugin.c:124 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" -msgstr "Wyślij do PicasaWeb" +msgstr "Wyślij do serwisu PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:126 -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:2 +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Wysyłanie zdjęć do serwisu PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:320 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "Wysyłanie..." -#: ../plugins/postasa/eog-postasa-plugin.c:366 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Wysłano" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Anulowano" -#: ../plugins/postasa/eog-postasa-plugin.c:373 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Nie powiodło się" -#: ../plugins/postasa/eog-postasa-plugin.c:520 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "Zalogowanie się nie powiodło. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:524 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "Zalogowano." -#: ../plugins/postasa/eog-postasa-plugin.c:525 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Zamknij" -#: ../plugins/postasa/eog-postasa-plugin.c:546 -#: ../plugins/postasa/postasa-config.xml.h:1 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Anuluj" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:552 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "Logowanie..." -#: ../plugins/postasa/eog-postasa-plugin.c:580 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "Proszę się zalogować, aby kontynuować wysyłanie." +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "Login serwisu PicasaWeb" + #: ../plugins/postasa/postasa-config.xml.h:2 -msgid "Login" -msgstr "Login" +msgid "_Cancel" +msgstr "_Anuluj" #: ../plugins/postasa/postasa-config.xml.h:3 -msgid "Password" -msgstr "Hasło" +msgid "_Login" +msgstr "_Login" #: ../plugins/postasa/postasa-config.xml.h:4 -msgid "PicasaWeb Login" -msgstr "Login serwisu PicasaWeb" +msgid "_Password:" +msgstr "_Hasło:" #: ../plugins/postasa/postasa-config.xml.h:5 -msgid "Username" -msgstr "Nazwa użytkownika" +msgid "_Username:" +msgstr "Nazwa _użytkownika:" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -202,54 +206,66 @@ msgstr "Anuluj wybrane" #: ../plugins/postasa/postasa-uploads.xml.h:3 +msgid "File" +msgstr "Plik" + +#: ../plugins/postasa/postasa-uploads.xml.h:4 +msgid "Size" +msgstr "Rozmiar" + +#: ../plugins/postasa/postasa-uploads.xml.h:5 +msgid "Status" +msgstr "Stan" + +#: ../plugins/postasa/postasa-uploads.xml.h:6 msgid "Uploads:" msgstr "Wysyłanie:" -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:1 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" msgstr "Wysyłanie do serwisu PicasaWeb" -#: ../plugins/postr/eog-postr-plugin.c:57 +#: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" -msgstr "Wyślij do Flickr" +msgstr "Wyślij do serwisu Flickr" -#: ../plugins/postr/eog-postr-plugin.c:59 -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:2 +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 msgid "Upload your pictures to Flickr" msgstr "Wysyłanie zdjęć do serwisu Flickr" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:1 +#: ../plugins/postr/postr.plugin.desktop.in.h:1 msgid "Flickr Uploader" msgstr "Wysyłanie do serwisu Flickr" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:1 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" msgstr "Konsola Python" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:2 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 msgid "Python console for Eye of GNOME" -msgstr "Konsola Python dla programu Eye of GNOME" +msgstr "Konsola języka Python dla programu Eye of GNOME" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:60 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 msgid "Send by Mail" msgstr "Wyślij przez e-mail" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:62 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 msgid "Send the selected images by mail" msgstr "Wysyłanie wybranych zdjęć przez e-mail" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:1 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 msgid "Send By Mail" msgstr "Wysyłanie przez e-mail" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:2 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 msgid "Sends an image attached to a new mail" msgstr "Wysyła obraz załączony do nowej wiadomości e-mail" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:1 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 msgid "Shuffles images in slideshow mode" msgstr "Losuje kolejność wyświetlania obrazów w trybie pokazu slajdów" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:2 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 msgid "Slideshow Shuffle" msgstr "Tryb losowy pokazu slajdów" diff -Nru eog-plugins-3.1.2/po/pt.po eog-plugins-3.2.2/po/pt.po --- eog-plugins-3.1.2/po/pt.po 2011-01-16 19:42:45.000000000 +0000 +++ eog-plugins-3.2.2/po/pt.po 2011-09-21 15:57:49.000000000 +0000 @@ -1,28 +1,30 @@ # eog-plugins' Portuguese translation. # Copyright © 2008, 2009 eog-plugins # This file is distributed under the same license as the eog-plugins package. -# -# António Lima , 2008, 2009. -# +# António Lima , 2008, 2009, 2011. msgid "" msgstr "" "Project-Id-Version: eog-plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-22 00:41+0000\n" -"PO-Revision-Date: 2010-02-18 22:27-0100\n" +"POT-Creation-Date: 2011-09-04 02:43+0100\n" +"PO-Revision-Date: 2011-09-02 22:30+0000\n" "Last-Translator: António Lima \n" -"Language-Team: Portuguese \n" +"Language-Team: gnome_pt@yahoogroups.com\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.0\n" +"X-Project-Style: gnome\n" -#: ../plugins/exif-display/eog-exif-display-plugin.c:136 +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" msgstr " (Unicode Inválido)" #. TRANSLATORS: This is the actual focal length used when #. the image was taken. -#: ../plugins/exif-display/eog-exif-display-plugin.c:212 +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" msgstr "%.1fmm (lentes)" @@ -30,7 +32,7 @@ #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming #. a 35mm film camera. -#: ../plugins/exif-display/eog-exif-display-plugin.c:223 +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 #, c-format msgid "%.1fmm (35mm film)" msgstr "%.1fmm (35mm filme)" @@ -55,11 +57,11 @@ msgid "Display per-channel histogram" msgstr "Mostrar um histograma por canal" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:1 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 msgid "Displays camera settings and histogram" msgstr "Mostrar definições da câmara e histograma" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:2 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 msgid "Exif display" msgstr "Mostrar Exif" @@ -91,103 +93,106 @@ msgid "Zoom:" msgstr "Zoom:" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:85 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 msgid "Fit to width" msgstr "Caber à largura" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:87 -#: ../plugins/fit-to-width/fit-to-width.eog-plugin.desktop.in.h:1 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 msgid "Zoom to fit image width" msgstr "Zoom para caber a largura da imagem" -#: ../plugins/map/eog-map-plugin.c:321 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Ir para a localização actual da imagem" -#: ../plugins/map/eog-map-plugin.c:333 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Aumentar Zoom" -#: ../plugins/map/eog-map-plugin.c:341 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Reduzir Zoom" -#: ../plugins/map/eog-map-plugin.c:355 -#: ../plugins/map/map.eog-plugin.desktop.in.h:2 +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Mapa" -#: ../plugins/map/map.eog-plugin.desktop.in.h:1 +#: ../plugins/map/map.plugin.desktop.in.h:1 msgid "Display the geolocation of the image on a map" msgstr "Apresentar a geolocalização da imagem num mapa" -#: ../plugins/postasa/eog-postasa-plugin.c:124 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" msgstr "Enviar para o PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:126 -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:2 +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Enviar as suas fotos para o PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:320 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "A enviar..." -#: ../plugins/postasa/eog-postasa-plugin.c:366 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Envida" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Cancelado" -#: ../plugins/postasa/eog-postasa-plugin.c:373 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Falha" -#: ../plugins/postasa/eog-postasa-plugin.c:520 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "Início de sessão falhou. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:524 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "Sessão iniciada com sucesso." -#: ../plugins/postasa/eog-postasa-plugin.c:525 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Fechar" -#: ../plugins/postasa/eog-postasa-plugin.c:546 -#: ../plugins/postasa/postasa-config.xml.h:1 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Cancelar" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:552 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "A iniciar sessão..." -#: ../plugins/postasa/eog-postasa-plugin.c:580 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "Por favor inicie sessão para continuar" +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "Início de sessão PicasaWeb" + #: ../plugins/postasa/postasa-config.xml.h:2 -msgid "Login" -msgstr "Iniciar Sessão" +msgid "_Cancel" +msgstr "_Cancelar" #: ../plugins/postasa/postasa-config.xml.h:3 -msgid "Password" -msgstr "Senha" +msgid "_Login" +msgstr "_Iniciar Sessão" #: ../plugins/postasa/postasa-config.xml.h:4 -msgid "PicasaWeb Login" -msgstr "Início de sessão PicasaWeb" +msgid "_Password:" +msgstr "_Senha:" #: ../plugins/postasa/postasa-config.xml.h:5 -msgid "Username" -msgstr "Nome de utilizador" +msgid "_Username:" +msgstr "Nome de _Utilizador:" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -201,52 +206,52 @@ msgid "Uploads:" msgstr "Envios" -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:1 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" msgstr "Envio para o PicasaWeb" -#: ../plugins/postr/eog-postr-plugin.c:57 +#: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" msgstr "Enviar para o Flickr" -#: ../plugins/postr/eog-postr-plugin.c:59 -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:2 +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 msgid "Upload your pictures to Flickr" msgstr "Enviar as suas fotos para o Flickr" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:1 +#: ../plugins/postr/postr.plugin.desktop.in.h:1 msgid "Flickr Uploader" msgstr "Envio para o Flickr" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:1 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" msgstr "Consola Python" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:2 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 msgid "Python console for Eye of GNOME" msgstr "Consola Python para o Eye of GNOME" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:60 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 msgid "Send by Mail" msgstr "Enviar por Mail" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:62 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 msgid "Send the selected images by mail" msgstr "Enviar as imagens seleccionadas por mail" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:1 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 msgid "Send By Mail" msgstr "Enviar por Mail" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:2 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 msgid "Sends an image attached to a new mail" msgstr "Enviar imagens anexadas a um novo email" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:1 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 msgid "Shuffles images in slideshow mode" msgstr "Baralha as imagens no modo de apresentação" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:2 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 msgid "Slideshow Shuffle" msgstr "Baralhar Apresentação" diff -Nru eog-plugins-3.1.2/po/ru.po eog-plugins-3.2.2/po/ru.po --- eog-plugins-3.1.2/po/ru.po 2011-06-10 19:56:07.000000000 +0000 +++ eog-plugins-3.2.2/po/ru.po 2011-07-31 10:15:14.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: eog-plugins master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=eog-plugins&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-04-22 10:27+0000\n" -"PO-Revision-Date: 2011-06-07 20:02+0300\n" +"POT-Creation-Date: 2011-07-11 20:36+0000\n" +"PO-Revision-Date: 2011-07-29 21:34+0300\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -121,73 +121,80 @@ msgid "Display the geolocation of the image on a map" msgstr "Отображение местоположения изображения на карте" -#: ../plugins/postasa/eog-postasa-plugin.c:124 +#: ../plugins/postasa/eog-postasa-plugin.c:127 msgid "Upload to PicasaWeb" msgstr "Загрузить в PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:126 -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:2 +#: ../plugins/postasa/eog-postasa-plugin.c:129 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Загрузка изображений в PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:320 +#: ../plugins/postasa/eog-postasa-plugin.c:324 msgid "Uploading..." msgstr "Загрузка…" -#: ../plugins/postasa/eog-postasa-plugin.c:366 +#: ../plugins/postasa/eog-postasa-plugin.c:370 msgid "Uploaded" msgstr "Загружено" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:374 msgid "Cancelled" msgstr "Отменено" -#: ../plugins/postasa/eog-postasa-plugin.c:373 +#: ../plugins/postasa/eog-postasa-plugin.c:377 msgid "Failed" msgstr "Сбой" -#: ../plugins/postasa/eog-postasa-plugin.c:581 +#: ../plugins/postasa/eog-postasa-plugin.c:600 #, c-format msgid "Login failed. %s" msgstr "Не удалось войти. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:585 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Logged in successully." msgstr "Вход завершён успешно." -#: ../plugins/postasa/eog-postasa-plugin.c:586 +#: ../plugins/postasa/eog-postasa-plugin.c:605 msgid "Close" msgstr "Закрыть" -#: ../plugins/postasa/eog-postasa-plugin.c:607 -#: ../plugins/postasa/postasa-config.xml.h:1 +#: ../plugins/postasa/eog-postasa-plugin.c:626 msgid "Cancel" msgstr "Отменить" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:613 +#: ../plugins/postasa/eog-postasa-plugin.c:632 msgid "Logging in..." msgstr "Вход…" -#: ../plugins/postasa/eog-postasa-plugin.c:641 +#: ../plugins/postasa/eog-postasa-plugin.c:677 msgid "Please log in to continue upload." msgstr "Чтобы продолжить загрузки, нужно выполнить вход." +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "Вход в PicasaWeb" + #: ../plugins/postasa/postasa-config.xml.h:2 -msgid "Login" -msgstr "Войти" +#| msgid "Cancel" +msgid "_Cancel" +msgstr "_Отменить" #: ../plugins/postasa/postasa-config.xml.h:3 -msgid "Password" -msgstr "Пароль" +#| msgid "Login" +msgid "_Login" +msgstr "_Войти" #: ../plugins/postasa/postasa-config.xml.h:4 -msgid "PicasaWeb Login" -msgstr "Вход в PicasaWeb" +#| msgid "Password" +msgid "_Password:" +msgstr "_Пароль:" #: ../plugins/postasa/postasa-config.xml.h:5 -msgid "Username" -msgstr "Имя пользователя" +#| msgid "Username" +msgid "_Username:" +msgstr "_Имя пользователя:" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -201,7 +208,7 @@ msgid "Uploads:" msgstr "Загрузки:" -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:1 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" msgstr "Загрузчик PicasaWeb" diff -Nru eog-plugins-3.1.2/po/sv.po eog-plugins-3.2.2/po/sv.po --- eog-plugins-3.1.2/po/sv.po 2011-01-16 19:42:45.000000000 +0000 +++ eog-plugins-3.2.2/po/sv.po 2011-10-20 10:20:20.000000000 +0000 @@ -7,21 +7,22 @@ msgstr "" "Project-Id-Version: eog-plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-13 22:32+0100\n" -"PO-Revision-Date: 2010-03-13 22:35+0100\n" +"POT-Creation-Date: 2011-10-17 10:56+0200\n" +"PO-Revision-Date: 2011-10-17 10:56+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../plugins/exif-display/eog-exif-display-plugin.c:136 +#: ../plugins/exif-display/eog-exif-display-plugin.c:105 msgid " (invalid Unicode)" msgstr " (ogiltig Unicode)" #. TRANSLATORS: This is the actual focal length used when #. the image was taken. -#: ../plugins/exif-display/eog-exif-display-plugin.c:212 +#: ../plugins/exif-display/eog-exif-display-plugin.c:183 #, c-format msgid "%.1fmm (lens)" msgstr "%.1fmm (lins)" @@ -29,7 +30,7 @@ #. Print as float to get a similar look as above. #. TRANSLATORS: This is the equivalent focal length assuming #. a 35mm film camera. -#: ../plugins/exif-display/eog-exif-display-plugin.c:223 +#: ../plugins/exif-display/eog-exif-display-plugin.c:194 #, c-format msgid "%.1fmm (35mm film)" msgstr "%.1fmm (35mm film)" @@ -54,11 +55,11 @@ msgid "Display per-channel histogram" msgstr "Visa histogram per kanal" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:1 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:1 msgid "Displays camera settings and histogram" msgstr "Visar kamerainställningar och histogram" -#: ../plugins/exif-display/exif-display.eog-plugin.desktop.in.h:2 +#: ../plugins/exif-display/exif-display.plugin.desktop.in.h:2 msgid "Exif display" msgstr "Exif-visning" @@ -90,103 +91,106 @@ msgid "Zoom:" msgstr "Zoom:" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:85 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:91 msgid "Fit to width" msgstr "Anpassa till bredd" -#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:87 -#: ../plugins/fit-to-width/fit-to-width.eog-plugin.desktop.in.h:1 +#: ../plugins/fit-to-width/eog-fit-to-width-plugin.c:93 +#: ../plugins/fit-to-width/fit-to-width.plugin.desktop.in.h:1 msgid "Zoom to fit image width" msgstr "Zooma för att passa bildens bredd" -#: ../plugins/map/eog-map-plugin.c:321 +#: ../plugins/map/eog-map-plugin.c:396 msgid "Jump to current image's location" msgstr "Hoppa till platsen för aktuell bild" -#: ../plugins/map/eog-map-plugin.c:333 +#: ../plugins/map/eog-map-plugin.c:408 msgid "Zoom in" msgstr "Zooma in" -#: ../plugins/map/eog-map-plugin.c:341 +#: ../plugins/map/eog-map-plugin.c:416 msgid "Zoom out" msgstr "Zooma ut" -#: ../plugins/map/eog-map-plugin.c:355 -#: ../plugins/map/map.eog-plugin.desktop.in.h:2 +#: ../plugins/map/eog-map-plugin.c:430 +#: ../plugins/map/map.plugin.desktop.in.h:2 msgid "Map" msgstr "Karta" -#: ../plugins/map/map.eog-plugin.desktop.in.h:1 +#: ../plugins/map/map.plugin.desktop.in.h:1 msgid "Display the geolocation of the image on a map" msgstr "Visa den geografiska platsen för bilden på en karta" -#: ../plugins/postasa/eog-postasa-plugin.c:124 +#: ../plugins/postasa/eog-postasa-plugin.c:126 msgid "Upload to PicasaWeb" msgstr "Skicka upp till PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:126 -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:2 +#: ../plugins/postasa/eog-postasa-plugin.c:128 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:2 msgid "Upload your pictures to PicasaWeb" msgstr "Skicka upp dina bilder till PicasaWeb" -#: ../plugins/postasa/eog-postasa-plugin.c:320 +#: ../plugins/postasa/eog-postasa-plugin.c:323 msgid "Uploading..." msgstr "Skickar upp..." -#: ../plugins/postasa/eog-postasa-plugin.c:366 +#: ../plugins/postasa/eog-postasa-plugin.c:369 msgid "Uploaded" msgstr "Skickades upp" -#: ../plugins/postasa/eog-postasa-plugin.c:370 +#: ../plugins/postasa/eog-postasa-plugin.c:373 msgid "Cancelled" msgstr "Avbruten" -#: ../plugins/postasa/eog-postasa-plugin.c:373 +#: ../plugins/postasa/eog-postasa-plugin.c:376 msgid "Failed" msgstr "Misslyckades" -#: ../plugins/postasa/eog-postasa-plugin.c:520 +#: ../plugins/postasa/eog-postasa-plugin.c:599 #, c-format msgid "Login failed. %s" msgstr "Inloggningen misslyckades. %s" -#: ../plugins/postasa/eog-postasa-plugin.c:524 +#: ../plugins/postasa/eog-postasa-plugin.c:603 msgid "Logged in successully." msgstr "Loggade in." -#: ../plugins/postasa/eog-postasa-plugin.c:525 +#: ../plugins/postasa/eog-postasa-plugin.c:604 msgid "Close" msgstr "Stäng" -#: ../plugins/postasa/eog-postasa-plugin.c:546 -#: ../plugins/postasa/postasa-config.xml.h:1 +#: ../plugins/postasa/eog-postasa-plugin.c:625 msgid "Cancel" msgstr "Avbryt" #. TODO: want to handle passwords more securely -#: ../plugins/postasa/eog-postasa-plugin.c:552 +#: ../plugins/postasa/eog-postasa-plugin.c:631 msgid "Logging in..." msgstr "Loggar in..." -#: ../plugins/postasa/eog-postasa-plugin.c:580 +#: ../plugins/postasa/eog-postasa-plugin.c:676 msgid "Please log in to continue upload." msgstr "Logga in för att fortsätta skicka upp." +#: ../plugins/postasa/postasa-config.xml.h:1 +msgid "PicasaWeb Login" +msgstr "Inloggningsnamn för PicasaWeb" + #: ../plugins/postasa/postasa-config.xml.h:2 -msgid "Login" -msgstr "Logga in" +msgid "_Cancel" +msgstr "_Avbryt" #: ../plugins/postasa/postasa-config.xml.h:3 -msgid "Password" -msgstr "Lösenord" +msgid "_Login" +msgstr "Logga _in" #: ../plugins/postasa/postasa-config.xml.h:4 -msgid "PicasaWeb Login" -msgstr "Inloggningsnamn för PicasaWeb" +msgid "_Password:" +msgstr "_Lösenord:" #: ../plugins/postasa/postasa-config.xml.h:5 -msgid "Username" -msgstr "Användarnamn" +msgid "_Username:" +msgstr "A_nvändarnamn:" #: ../plugins/postasa/postasa-uploads.xml.h:1 msgid "Cancel All" @@ -200,61 +204,63 @@ msgid "Uploads:" msgstr "Sändningar:" -#: ../plugins/postasa/postasa.eog-plugin.desktop.in.h:1 +#: ../plugins/postasa/postasa.plugin.desktop.in.h:1 msgid "PicasaWeb Uploader" msgstr "Skicka till PicasaWeb" -#: ../plugins/postr/eog-postr-plugin.c:57 +#: ../plugins/postr/eog-postr-plugin.c:62 msgid "Upload to Flickr" msgstr "Skicka upp till Flickr" -#: ../plugins/postr/eog-postr-plugin.c:59 -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:2 +#: ../plugins/postr/eog-postr-plugin.c:64 +#: ../plugins/postr/postr.plugin.desktop.in.h:2 msgid "Upload your pictures to Flickr" msgstr "Skicka upp dina bilder till Flickr" -#: ../plugins/postr/postr.eog-plugin.desktop.in.h:1 +#: ../plugins/postr/postr.plugin.desktop.in.h:1 msgid "Flickr Uploader" msgstr "Skicka till Flickr" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:1 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:1 msgid "Python Console" msgstr "Python-konsoll" -#: ../plugins/pythonconsole/pythonconsole.eog-plugin.desktop.in.h:2 +#: ../plugins/pythonconsole/pythonconsole.plugin.desktop.in.h:2 msgid "Python console for Eye of GNOME" msgstr "Python-konsoll för Eye of GNOME" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:60 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:63 msgid "Send by Mail" msgstr "Skicka med e-post" -#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:62 +#: ../plugins/send-by-mail/eog-send-by-mail-plugin.c:65 msgid "Send the selected images by mail" msgstr "Skicka markerade bilder med e-post" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:1 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:1 msgid "Send By Mail" msgstr "Skicka med e-post" -#: ../plugins/send-by-mail/send-by-mail.eog-plugin.desktop.in.h:2 +#: ../plugins/send-by-mail/send-by-mail.plugin.desktop.in.h:2 msgid "Sends an image attached to a new mail" msgstr "Skicka en bild bifogad till ett nytt e-postmeddelande" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:1 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:1 msgid "Shuffles images in slideshow mode" msgstr "Blandar bilder i bildspelsläget" -#: ../plugins/slideshowshuffle/slideshowshuffle.eog-plugin.desktop.in.h:2 +#: ../plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in.h:2 msgid "Slideshow Shuffle" msgstr "Blandat bildspel" #~ msgid "Reload Image" #~ msgstr "Läs om bild" + #~ msgid "Reload current image" #~ msgstr "Läs om aktuell bild" + #~ msgid "Activate fullscreen mode with double-click" #~ msgstr "Aktivera helskärmsläge med dubbelklick" + #~ msgid "Fullscreen with double-click" #~ msgstr "Helskärm med dubbelklick" -